Permalink
Browse files

Merge pull request #59 from pklingem/master

update backbone to 1.1.1 and underscore to 1.6.0
  • Loading branch information...
2 parents 9187508 + a286fea commit 040f653f485f4296e52b6953c30bf83fbac9d82c @meleyal committed Feb 14, 2014
View
@@ -1,6 +1,11 @@
CHANGELOG
=========
+1.1.1.0 (Feb 13, 2014)
+----------------------
+- Update Backbone to 1.1.1
+- Update Underscore to 1.6.0
+
1.1.0.0 (Oct 14, 2013)
----------------------
- Update Backbone to 1.1.0
@@ -1,3 +1,3 @@
module BackboneOnRails
- VERSION = "1.1.0.0"
+ VERSION = "1.1.1.0"
end
@@ -10,12 +10,12 @@ def setup
test "underscore.js is found as an asset" do
assert_not_nil @app.assets["underscore"]
- assert_file "#{BackboneOnRails::Engine.root}/vendor/assets/javascripts/underscore.js", /1.5.2/
+ assert_file "#{BackboneOnRails::Engine.root}/vendor/assets/javascripts/underscore.js", /1.6.0/
end
test "backbone.js is found as an asset" do
assert_not_nil @app.assets["backbone"]
- assert_file "#{BackboneOnRails::Engine.root}/vendor/assets/javascripts/backbone.js", /1.1.0/
+ assert_file "#{BackboneOnRails::Engine.root}/vendor/assets/javascripts/backbone.js", /1.1.1/
end
end
Oops, something went wrong.

0 comments on commit 040f653

Please sign in to comment.