diff --git a/Gemfile b/Gemfile index a91e14e787cc385cff4c5810be3bd58128c818d9..0a3a2b4b39841d5d2310250dee8e29073e0285f7 100644 --- a/Gemfile +++ b/Gemfile @@ -124,7 +124,7 @@ group :assets do gem "asset_sync", '0.5.0', :require => false end -gem 'jquery-rails', '2.1.3' +gem 'jquery-rails', '2.1.4' # web diff --git a/Gemfile.lock b/Gemfile.lock index 42e0af53ba14ea20e7b823924b0f5bd4df4373b0..efcbad28ed569c29cf65314d41aef6e189cb5d6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,9 +192,9 @@ GEM selenium-webdriver (>= 0.1.3) jasmine-core (1.3.1) journey (1.0.4) - jquery-rails (2.1.3) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) jquery-ui-rails (3.0.1) jquery-rails railties (>= 3.1.0) @@ -447,7 +447,7 @@ DEPENDENCIES http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) jasmine (= 1.3.1) - jquery-rails (= 2.1.3) + jquery-rails (= 2.1.4) json (= 1.7.5) markerb! messagebus_ruby_api (= 1.0.3)