deps: ember@2.5.0

app/instance-initializers/jquery-ajax-oauth-prefilter.js

@@ -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);
             });
         });
     }

bower.json

@@ -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",

config/deprecation-workflow.js

@@ -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'}
     ]

tests/helpers/start-app.js

@@ -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);