diff --git a/Gemfile b/Gemfile index 3df788509a..88577f2f4c 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,6 @@ gem 'foundation-icons-sass-rails' gem 'foundation-rails', '= 5.5.2.1' -gem 'jquery-migrate-rails' gem 'jquery-rails', '4.4.0' gem 'jquery-ui-rails', '~> 4.2' gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1" diff --git a/Gemfile.lock b/Gemfile.lock index 1609fdd768..bc20935e75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -332,7 +332,6 @@ GEM immigrant (0.3.6) activerecord (>= 3.0) ipaddress (0.8.3) - jquery-migrate-rails (1.2.1) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -736,7 +735,6 @@ DEPENDENCIES i18n i18n-js (~> 3.8.3) immigrant - jquery-migrate-rails jquery-rails (= 4.4.0) jquery-ui-rails (~> 4.2) json diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index 8b462886ad..e0e115ba6d 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -6,8 +6,7 @@ // // jquery and angular -//= require jquery -//= require jquery-migrate-min +//= require jquery2 //= require jquery_ujs //= require jquery.ui.all //= require jquery.powertip diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee index 02ef4042d5..2b48de4dcf 100644 --- a/app/assets/javascripts/darkswarm/all.js.coffee +++ b/app/assets/javascripts/darkswarm/all.js.coffee @@ -1,4 +1,4 @@ -#= require jquery +#= require jquery2 #= require jquery_ujs #= require jquery.ui.all #