diff --git a/Gemfile b/Gemfile index c3520a1bc..f5a4a37bd 100644 --- a/Gemfile +++ b/Gemfile @@ -150,7 +150,7 @@ gem 'sinatra', '>= 1.3.0', :require => nil gem 'memcache-client' -gem 'jquery-ui-rails', '~> 4.1.0' +gem 'jquery-ui-rails', '~> 6.0.1' gem 'geoip' diff --git a/Gemfile.lock b/Gemfile.lock index 1cc78f272..ba4508f7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,7 +142,7 @@ GEM execjs coffee-script-source (1.12.2) columnize (0.8.9) - concurrent-ruby (1.1.5) + concurrent-ruby (1.2.3) connection_pool (2.2.0) coveralls (0.7.1) multi_json (~> 1.3) @@ -253,8 +253,8 @@ GEM jquery-rails (2.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (4.1.2) - railties (>= 3.1.0) + jquery-ui-rails (6.0.1) + railties (>= 3.2.16) jslint_on_rails (1.1.1) json (2.2.0) json_spec (1.1.5) @@ -483,7 +483,7 @@ GEM polyglot polyglot (>= 0.3.1) ttfunk (1.0.3) - tzinfo (0.3.46) + tzinfo (0.3.62) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) @@ -566,7 +566,7 @@ DEPENDENCIES jquery-cookie-rails (~> 1.3.1.1) jquery-mousewheel-rails (~> 0.0.9) jquery-rails (= 2.1.4) - jquery-ui-rails (~> 4.1.0) + jquery-ui-rails (~> 6.0.1) jslint_on_rails json_spec (= 1.1.5) kaminari