Skip to content

Commit 6e98c02

Browse files
committed
Upgraded to ember.js 1.1.2 and the latest ember-data 1.0 beta (master)
1 parent e046977 commit 6e98c02

File tree

4 files changed

+1192
-609
lines changed

4 files changed

+1192
-609
lines changed

Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module.exports = function (grunt) {
4747
src: [
4848
'tests/lib/jquery-1.9.1.js',
4949
'tests/lib/handlebars-1.0.0.js',
50-
'tests/lib/ember-1.0.0.js',
50+
'tests/lib/ember.js',
5151
'tests/lib/ember-data.js',
5252
'tests/lib/jquery.mockjax.js',
5353
'tests/lib/tmpl.min.js',
@@ -115,4 +115,4 @@ module.exports = function (grunt) {
115115
grunt.task.registerTask('build', ['neuter:build']);
116116
grunt.task.registerTask('dist', ['build', 'replace:strip_debug_messages_production', 'uglify:dist', 'get_git_rev', 'usebanner']);
117117
grunt.task.registerTask('default', ['dist']);
118-
}
118+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"grunt-cli": "*",
55
"grunt-contrib-concat": "*",
66
"grunt-contrib-jshint": "*",
7-
"grunt-ember-template-compiler": "1.0.6",
7+
"grunt-ember-template-compiler": "1.1.2",
88
"karma-qunit": "*",
99
"karma": "0.10.0"
1010
},

0 commit comments

Comments
 (0)