diff --git a/Gemfile b/Gemfile index a3ffa78b1..73546edd8 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ gem "entypo-rails", "2.2.2" # JavaScript -gem "backbone-on-rails", "1.1.2" +gem "backbone-on-rails", "1.1.2.1" gem "handlebars_assets", "0.20.1" gem "jquery-rails", "4.0.3" gem "jquery-ui-rails", "5.0.3" diff --git a/Gemfile.lock b/Gemfile.lock index ac8aef235..6ba6bca11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,10 +40,6 @@ GEM arel (~> 6.0) activerecord-import (0.7.0) activerecord (>= 3.0) - activeresource (4.0.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.1) activesupport (4.2.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -68,11 +64,7 @@ GEM autoprefixer-rails (5.1.11) execjs json - backbone-on-rails (1.1.2.0) - actionmailer - actionpack - activemodel - activeresource + backbone-on-rails (1.1.2.1) eco ejs jquery-rails @@ -103,10 +95,10 @@ GEM coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) + coffee-script-source (1.9.1.1) columnize (0.9.0) compass (1.0.3) chunky_png (~> 1.2) @@ -289,7 +281,7 @@ GEM ruby-progressbar (~> 1.4) gherkin (2.12.2) multi_json (~> 1.3) - globalid (0.3.3) + globalid (0.3.5) activesupport (>= 4.1.0) gon (5.2.3) actionpack (>= 2.3.0) @@ -388,7 +380,7 @@ GEM redcarpet (>= 2.0) messagebus_ruby_api (1.0.3) method_source (0.8.2) - mime-types (2.4.3) + mime-types (2.5) mini_magick (4.2.0) mini_portile (0.6.2) minitest (5.6.1) @@ -533,8 +525,6 @@ GEM rails-i18n (4.0.4) i18n (~> 0.6) railties (~> 4.0) - rails-observers (0.1.2) - activemodel (~> 4.0) rails-timeago (2.11.0) actionpack (>= 3.1) activesupport (>= 3.1) @@ -712,7 +702,7 @@ DEPENDENCIES addressable (= 2.3.8) asset_sync (= 1.1.0) autoprefixer-rails (= 5.1.11) - backbone-on-rails (= 1.1.2) + backbone-on-rails (= 1.1.2.1) bootstrap-sass (= 2.3.2.2) capybara (= 2.4.4) carrierwave (= 0.10.0)