Skip to content

Commit 136ad78

Browse files
committed
Merge branch 'hotfix/0.5.2'
2 parents 76f745e + 88e391f commit 136ad78

File tree

3 files changed

+17
-31
lines changed

3 files changed

+17
-31
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [0.5.2] - 2018-07-11
8+
### Fixed
9+
- Lazy engine title stealing
10+
711
## [0.5.1] - 2018-07-10
812
### Added
913
- Missing analytics:

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-osf-web",
3-
"version": "0.5.1",
3+
"version": "0.5.2",
44
"description": "Ember front-end for the Open Science Framework",
55
"license": "Apache-2.0",
66
"author": "Center for Open Science <[email protected]>",
@@ -80,7 +80,7 @@
8080
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
8181
"ember-cli-inject-live-reload": "^1.4.1",
8282
"ember-cli-inline-content": "0.4.1",
83-
"ember-cli-meta-tags": "^4.0.0",
83+
"ember-cli-meta-tags": "^5.0.0",
8484
"ember-cli-mirage": "^0.4.7",
8585
"ember-cli-moment-shim": "^3.5.0",
8686
"ember-cli-password-strength": "^2.0.0",

yarn.lock

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4722,19 +4722,12 @@ ember-cli-get-dependency-depth@^1.0.0:
47224722
version "1.0.0"
47234723
resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11"
47244724

4725-
ember-cli-head@^0.3.0:
4726-
version "0.3.1"
4727-
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-0.3.1.tgz#a407df4880f235280371c437bb5b0b5cbdaea646"
4728-
dependencies:
4729-
ember-cli-babel "^6.1.0"
4730-
ember-cli-htmlbars "^2.0.1"
4731-
4732-
ember-cli-head@^0.4.0:
4733-
version "0.4.0"
4734-
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-0.4.0.tgz#348f7595cee5bcb024a87d1c72c8d55fedda32f7"
4725+
ember-cli-head@^0.4.0, ember-cli-head@^0.4.1:
4726+
version "0.4.1"
4727+
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-0.4.1.tgz#28b7ee86439746640834b232a3b34ab1329f3cf3"
47354728
dependencies:
4736-
ember-cli-babel "^6.1.0"
4737-
ember-cli-htmlbars "^2.0.1"
4729+
ember-cli-babel "^6.11.0"
4730+
ember-cli-htmlbars "^2.0.3"
47384731

47394732
ember-cli-htmlbars-inline-precompile@^1.0.0, ember-cli-htmlbars-inline-precompile@^1.0.2:
47404733
version "1.0.2"
@@ -4746,16 +4739,6 @@ ember-cli-htmlbars-inline-precompile@^1.0.0, ember-cli-htmlbars-inline-precompil
47464739
heimdalljs-logger "^0.1.7"
47474740
silent-error "^1.1.0"
47484741

4749-
ember-cli-htmlbars@^1.1.1:
4750-
version "1.3.4"
4751-
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.4.tgz#461289724b34af372a6a0c4b6635819156963353"
4752-
dependencies:
4753-
broccoli-persistent-filter "^1.0.3"
4754-
ember-cli-version-checker "^1.0.2"
4755-
hash-for-dep "^1.0.2"
4756-
json-stable-stringify "^1.0.0"
4757-
strip-bom "^2.0.0"
4758-
47594742
ember-cli-htmlbars@^2.0.1, ember-cli-htmlbars@^2.0.2, ember-cli-htmlbars@^2.0.3:
47604743
version "2.0.3"
47614744
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.3.tgz#e116e1500dba12f29c94b05b9ec90f52cb8bb042"
@@ -4828,14 +4811,13 @@ ember-cli-lodash-subset@^2.0.1:
48284811
version "2.0.1"
48294812
resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
48304813

4831-
ember-cli-meta-tags@^4.0.0:
4832-
version "4.0.0"
4833-
resolved "https://registry.yarnpkg.com/ember-cli-meta-tags/-/ember-cli-meta-tags-4.0.0.tgz#38140f7b96f5b26834b531e6093e5370bab575a3"
4814+
ember-cli-meta-tags@^5.0.0:
4815+
version "5.0.0"
4816+
resolved "https://registry.yarnpkg.com/ember-cli-meta-tags/-/ember-cli-meta-tags-5.0.0.tgz#d347930ddec595ad6a731ed82d035d20e3c99b15"
48344817
dependencies:
4835-
ember-cli-babel "^6.0.0"
4836-
ember-cli-head "^0.3.0"
4837-
ember-cli-htmlbars "^1.1.1"
4838-
ember-runtime-enumerable-includes-polyfill "^2.0.0"
4818+
ember-cli-babel "^6.6.0"
4819+
ember-cli-head "^0.4.1"
4820+
ember-cli-htmlbars "^2.0.1"
48394821

48404822
ember-cli-mirage@^0.4.7:
48414823
version "0.4.7"

0 commit comments

Comments
 (0)