diff --git a/Gemfile b/Gemfile index c8e837df6..7fb82b931 100644 --- a/Gemfile +++ b/Gemfile @@ -76,15 +76,15 @@ gem 'entypo-rails', '2.2.2' # JavaScript -gem 'backbone-on-rails', '1.1.1' -gem 'handlebars_assets', '0.12.0' -gem 'jquery-rails', '3.0.4' -gem 'js_image_paths', '0.0.1' +gem 'backbone-on-rails', '1.1.1' +gem 'handlebars_assets', '0.12.0' +gem 'jquery-rails', '3.1.1' +gem 'rails-assets-jquery', '1.11.1' # Should be kept in sync with jquery-rails +gem 'js_image_paths', '0.0.1' # jQuery plugins gem 'rails-assets-perfect-scrollbar', '0.4.11' -gem 'rails-assets-jquery', '1.10.2' # Localization diff --git a/Gemfile.lock b/Gemfile.lock index 37ee6827b..c7f7d23e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -232,7 +232,7 @@ GEM rake jasmine-core (2.0.2) jasmine-jquery-rails (2.0.3) - jquery-rails (3.0.4) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) @@ -343,7 +343,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.1.5) sprockets-rails (~> 2.0) - rails-assets-jquery (1.10.2) + rails-assets-jquery (1.11.1) rails-assets-perfect-scrollbar (0.4.11) rails-assets-jquery (>= 1.10) rails-i18n (4.0.2) @@ -536,7 +536,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 2.0.2) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 3.0.4) + jquery-rails (= 3.1.1) js_image_paths (= 0.0.1) json (= 1.8.1) markerb (= 1.0.2) @@ -558,7 +558,7 @@ DEPENDENCIES rack-rewrite (= 1.5.0) rack-ssl (= 1.4.1) rails (= 4.1.5) - rails-assets-jquery (= 1.10.2) + rails-assets-jquery (= 1.11.1) rails-assets-perfect-scrollbar (= 0.4.11) rails-i18n (= 4.0.2) rails-timeago (= 2.11.0)