diff --git a/Gemfile b/Gemfile index c3520a1bc..9193ac935 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,7 @@ gem 'ember-rails', '~> 0.14.1' gem 'ember-source', '~> 1.6.0' gem 'ember-data-source', '0.14' gem 'handlebars-source', '1.0.12' -gem 'jquery-rails', '2.1.4' # do not upgrade until https://github.com/jquery/jquery/pull/1142 isd pulled into jquery-rails +gem 'jquery-rails', '3.1.5' # do not upgrade until https://github.com/jquery/jquery/pull/1142 isd pulled into jquery-rails gem 'jquery-mousewheel-rails', '~> 0.0.9' gem 'jquery-cookie-rails', '~> 1.3.1.1' gem 'bootstrap-sass', '~> 2.3.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 1cc78f272..5b29d7275 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) @@ -250,7 +250,7 @@ GEM railties (>= 3.2.0, < 5.0) jquery-mousewheel-rails (0.0.9) railties (>= 3.1) - jquery-rails (2.1.4) + jquery-rails (3.1.5) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.1.2) @@ -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) @@ -565,7 +565,7 @@ DEPENDENCIES inherited_resources (~> 1.7.0) jquery-cookie-rails (~> 1.3.1.1) jquery-mousewheel-rails (~> 0.0.9) - jquery-rails (= 2.1.4) + jquery-rails (= 3.1.5) jquery-ui-rails (~> 4.1.0) jslint_on_rails json_spec (= 1.1.5)