diff options
| author | Mark Longair <mhl@pobox.com> | 2013-11-25 17:48:17 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-11-26 10:16:46 +0000 |
| commit | 27b0f4016b4dec406261061b4916e02df346b57d (patch) | |
| tree | 0453224f128ddf471e4acef06d73fe737ed10f07 | |
| parent | 68a8a9945d73e22d19d58f89162f46c3d175fc58 (diff) | |
Update to jquery-rails to a version without jquery-ui
The jquery-rails documentation for the latest version now recommends
using the jquery-ui-rails plugin instead. To avoid the possible
confusion of having two copies of jquery-ui in different gems, update
jquery-rails to the version that doesn't contain jquery-ui.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -17,7 +17,7 @@ gem 'charlock_holmes' gem 'dynamic_form' gem 'exception_notification' gem 'fastercsv', '>=1.5.5' -gem 'jquery-rails', '~> 2.1' +gem 'jquery-rails', '~> 3.0.4' gem 'json' gem 'mahoro' gem 'net-http-local' diff --git a/Gemfile.lock b/Gemfile.lock index 43926e6c5..cdbfcba64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM highline (1.6.19) hike (1.2.3) i18n (0.6.5) - jquery-rails (2.3.0) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.0) @@ -293,7 +293,7 @@ DEPENDENCIES gettext gettext_i18n_rails globalize3! - jquery-rails (~> 2.1) + jquery-rails (~> 3.0.4) json locale mahoro |