TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-26 20:34:02 +03:00
Code Issues Projects Releases Wiki Activity

deps: ember@2.5.1

Browse Source 
- removes Ember.merge deprecation
This commit is contained in:
Austin Burdine 2016-04-28 07:15:15 -05:00
parent 50d1737a25
commit 0017a5ace9
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/bower.json
View File

@ -4,7 +4,7 @@
"blueimp-md5": "2.3.0", "blueimp-md5": "2.3.0",
"codemirror": "5.13.2", "codemirror": "5.13.2",
"devicejs": "0.2.7", "devicejs": "0.2.7",
"ember": "2.5.0", "ember": "2.5.1",
"ember-cli-shims": "0.1.1", "ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2", "ember-cli-test-loader": "0.2.2",
"ember-mocha": "0.8.11", "ember-mocha": "0.8.11",

1
ghost/admin/config/deprecation-workflow.js
View File

@ -1,7 +1,6 @@
window.deprecationWorkflow = window.deprecationWorkflow || {}; window.deprecationWorkflow = window.deprecationWorkflow || {};
window.deprecationWorkflow.config = { window.deprecationWorkflow.config = {
workflow: [ workflow: [
{handler: 'silence', matchMessage: 'Usage of `Ember.merge` is deprecated, use `Ember.assign` instead.'},
{handler: 'silence', matchMessage: 'Using the injected `container` is deprecated. Please use the `getOwner` helper instead to access the owner of this object.'}, {handler: 'silence', matchMessage: 'Using the injected `container` is deprecated. Please use the `getOwner` helper instead to access the owner of this object.'},
{handler: 'silence', matchMessage: 'You modified (-join-classes "ember-view" "form-group" (-normalize-class "errorClass" errorClass activeClass=undefined inactiveClass=undefined)) twice in a single render. This was unreliable in Ember 1.x and will be removed in Ember 3.0'} {handler: 'silence', matchMessage: 'You modified (-join-classes "ember-view" "form-group" (-normalize-class "errorClass" errorClass activeClass=undefined inactiveClass=undefined)) twice in a single render. This was unreliable in Ember 1.x and will be removed in Ember 3.0'}
] ]