Skip to content

Commit 07ed8c7

Browse files
committed
Update ember to 2.7.0
1 parent fd0014b commit 07ed8c7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

bower.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Faker": "~3.1.0",
55
"bootstrap": "~3.3.1",
66
"bootstrap-markdown": "~2.8.0",
7-
"ember": "~2.4.1",
7+
"ember": "~2.7.0",
88
"ember-cli-shims": "0.1.0",
99
"ember-cli-test-loader": "0.2.2",
1010
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
@@ -26,7 +26,6 @@
2626
"ceibo": "~1.1.0"
2727
},
2828
"resolutions": {
29-
"ember": "~2.4.1",
30-
"FakeXMLHttpRequest": "^1.4.0"
29+
"ember": "~2.7.0"
3130
}
3231
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"broccoli-static-compiler": "^0.2.2",
2525
"ember-ajax": "2.0.0-beta.3",
2626
"ember-bootstrap-datetimepicker": "1.0.1",
27-
"ember-cli": "2.4.2",
27+
"ember-cli": "^2.7.0",
2828
"ember-cli-app-version": "^1.0.0",
2929
"ember-cli-babel": "^5.1.5",
3030
"ember-cli-dependency-checker": "^1.2.0",
@@ -52,7 +52,7 @@
5252
"ember-cli-sri": "^2.1.0",
5353
"ember-cli-uglify": "^1.2.0",
5454
"ember-concurrency": "0.5.17",
55-
"ember-data": "^2.4.0",
55+
"ember-data": "^2.7.0",
5656
"ember-deploy-redis": "0.0.2",
5757
"ember-disable-proxy-controllers": "^1.0.1",
5858
"ember-export-application-global": "^1.0.4",
@@ -63,14 +63,14 @@
6363
"ember-notify": "^4.3.1",
6464
"ember-resize": "0.0.10",
6565
"ember-resolver": "^2.0.3",
66-
"ember-simple-auth": "1.0.1",
66+
"ember-simple-auth": "^1.1.0",
6767
"ember-sinon": "0.5.0",
6868
"ember-sortable": "1.6.3",
6969
"ember-validations": "2.0.0-alpha.4",
7070
"ember-watson": "^0.5.4",
7171
"emberx-select": "2.1.0",
7272
"express": "^4.8.5",
73-
"liquid-fire": "0.23.0",
73+
"liquid-fire": "^0.24.0",
7474
"loader.js": "^4.0.0",
7575
"moment": "2.11.1",
7676
"moment-timezone": "0.5.0",

0 commit comments

Comments
 (0)