From edcdae6b5848bacd3284b318111a1a2eacf6088c Mon Sep 17 00:00:00 2001 From: Kok Hung Cheah Date: Thu, 7 May 2020 10:48:07 +1000 Subject: [PATCH 1/2] Update jquery-ui-rails version to 4.1.1 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index dcf202d4f3..4b9280da54 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ gem "foundation-rails" gem 'jquery-migrate-rails' gem 'jquery-rails', '3.1.5' -gem 'jquery-ui-rails', '~> 4.0.0' +gem 'jquery-ui-rails', '~> 4.1.1' gem 'select2-rails', '~> 3.4.7' gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c' diff --git a/Gemfile.lock b/Gemfile.lock index 2a8733bb7c..43c25c084e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -418,7 +418,7 @@ GEM jquery-rails (3.1.5) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (4.0.5) + jquery-ui-rails (4.1.2) railties (>= 3.1.0) json (1.8.6) json_spec (1.1.5) @@ -726,7 +726,7 @@ DEPENDENCIES immigrant jquery-migrate-rails jquery-rails (= 3.1.5) - jquery-ui-rails (~> 4.0.0) + jquery-ui-rails (~> 4.1.1) json_spec (~> 1.1.4) jwt (~> 2.2) kaminari (~> 0.14.1) From 19d5bcb1501ceacad90ea6ea711733fb3b8a113d Mon Sep 17 00:00:00 2001 From: Kok Hung Cheah Date: Fri, 8 May 2020 09:54:10 +1000 Subject: [PATCH 2/2] Upgrade jquery-ui-rails to 4.1.2 instead of 4.1.1 --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 4b9280da54..2acddae430 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ gem "foundation-rails" gem 'jquery-migrate-rails' gem 'jquery-rails', '3.1.5' -gem 'jquery-ui-rails', '~> 4.1.1' +gem 'jquery-ui-rails', '~> 4.1.2' gem 'select2-rails', '~> 3.4.7' gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c' diff --git a/Gemfile.lock b/Gemfile.lock index 43c25c084e..c3d00e322a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -726,7 +726,7 @@ DEPENDENCIES immigrant jquery-migrate-rails jquery-rails (= 3.1.5) - jquery-ui-rails (~> 4.1.1) + jquery-ui-rails (~> 4.1.2) json_spec (~> 1.1.4) jwt (~> 2.2) kaminari (~> 0.14.1)