Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Merge pull request #6729 from acburdine/ember-2.5

Browse source 
Ember Dependency Updates
This commit is contained in:
Kevin Ansfield 2016-04-15 08:56:56 +01:00
commit 63dd3e2cb9
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/client/app/instance-initializers/jquery-ajax-oauth-prefilter.js vendored
View file

@ -1,6 +1,6 @@
import Ember from 'ember';
const {merge} = Ember;
const {assign} = Ember;
export default {
name: 'jquery-ajax-oauth-prefilter',
@ -14,7 +14,7 @@ export default {
let headerObject = {};
headerObject[headerName] = headerValue;
options.headers = merge(options.headers || {}, headerObject);
options.headers = assign(options.headers || {}, headerObject);
});
});
}

2
core/client/bower.json
View file

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

1
core/client/config/deprecation-workflow.js
View file

@ -1,6 +1,7 @@
window.deprecationWorkflow = window.deprecationWorkflow || {};
window.deprecationWorkflow.config = {
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: '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'}
]

2
core/client/package.json
View file

@ -37,7 +37,7 @@
"ember-cli-selectize": "0.4.3",
"ember-cli-sri": "2.1.0",
"ember-cli-uglify": "1.2.0",
"ember-data": "2.4.3",
"ember-data": "2.5.2",
"ember-data-filter": "1.13.0",
"ember-export-application-global": "1.0.5",
"ember-load-initializers": "0.5.1",

6
core/client/tests/helpers/start-app.js
View file

@ -2,14 +2,14 @@ import Ember from 'ember';
import Application from '../../app';
import config from '../../config/environment';
const {merge, run} = Ember;
const {assign, run} = Ember;
export default function startApp(attrs) {
let attributes = merge({}, config.APP);
let attributes = assign({}, config.APP);
let application;
// use defaults, but you can override;
attributes = merge(attributes, attrs);
attributes = assign(attributes, attrs);
run(function () {
application = Application.create(attributes);