Merge pull request #192 from crossroads/master

#MayRelease2
crossroads · May 29, 2018 · 50d06de · 50d06de
2 parents 5ee4c34 + 6577c95
commit 50d06de
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "goodcity",
   "dependencies": {
-    "ember": "~2.11.0",
+    "ember": "~2.12.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-cli-shims": "0.1.0",
     "cloudinary": "~1.0.12",
@@ -28,7 +28,7 @@
     "ember-cli-test-loader": "0.2.2",
     "ember-cli-shims": "0.1.0",
     "qunit-notifications": "~0.1.0",
-    "ember": "~2.11.0",
+    "ember": "~2.12.0",
     "ember-qunit-notifications": "0.1.0"
   },
   "devDependencies": {

diff --git a/package.json b/package.json
@@ -24,8 +24,8 @@
     "broccoli-asset-rev": "^2.6.0",
     "connect-restreamer": "^1.0.3",
     "cors": "^2.7.1",
-    "ember-ajax": "^2.4.1",
-    "ember-cli": "2.11.0",
+    "ember-ajax": "^2.5.1",
+    "ember-cli": "2.12.0",
     "ember-cli-app-version": "^3.1.0",
     "ember-cli-babel": "5.2.4",
     "ember-cli-coffeescript": "^1.16.1",

diff --git a/tests/unit/models/offer-test.js b/tests/unit/models/offer-test.js
@@ -8,7 +8,7 @@ moduleForModel('offer', 'Offer Model', {
     'model:rejection_reason', 'model:contact', 'model:permission',
     'model:gogovan_transport', 'model:crossroads_transport',
     'model:package_type', 'model:gogovan_order', 'model:address',
-    'model:cancellation_reason']
+    'model:cancellation_reason', 'service:i18n']
 });
 
 test('offer is a valid ember-data Model', function () {