Depend on select2-rails without the thor v0.14 requirement

This commit is contained in:
Luis Ramos
2021-05-10 21:37:36 +01:00
parent 24edad15ae
commit 466f7030c6
2 changed files with 11 additions and 5 deletions

View File

@@ -112,7 +112,7 @@ 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', '~> 3.4.7'
gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
# Thor v0.20 works with both select2-rails 3.4.7 and railties 6.0.3.6
# To upgrade to thor v1 we need to upgrade select2-rails to v3.5 which requires some work
gem 'thor', '~> 0.20'

View File

@@ -21,6 +21,15 @@ GIT
specs:
ofn-qz (0.1.0)
GIT
remote: https://github.com/openfoodfoundation/select2-rails.git
revision: fc240e85fbdf1878ff3c39d972c0cd9a312f5ed4
branch: v349_with_thor_v1
specs:
select2-rails (3.4.9)
sass-rails
thor (>= 0.14)
PATH
remote: engines/catalog
specs:
@@ -563,9 +572,6 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
select2-rails (3.4.9)
sass-rails
thor (~> 0.14)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
@@ -764,7 +770,7 @@ DEPENDENCIES
rubocop-rails
sass (~> 3.4.0)
sass-rails (< 5.1.0)
select2-rails (~> 3.4.7)
select2-rails!
selenium-webdriver
shoulda-matchers
sidekiq