diff --git a/Gemfile b/Gemfile index 95701f8e06..ad65996550 100644 --- a/Gemfile +++ b/Gemfile @@ -4,14 +4,14 @@ source 'https://rubygems.org' ruby "2.5.9" git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" } -gem 'rails', '~> 5.2' +gem 'rails', '~> 6.0.3.6' gem 'activemerchant', '>= 1.78.0' gem 'angular-rails-templates', '>= 0.3.0' gem 'awesome_nested_set' gem 'ransack', '2.4.1' gem 'responders' -gem 'sass', '<= 4.7.1' +gem 'sass', '~> 3.4.0' # this restriction originates from foundation-rails's version gem 'sass-rails', '< 6.0.0' gem 'i18n' @@ -20,7 +20,7 @@ gem 'rails-i18n' gem 'rails_safe_tasks', '~> 1.0' gem "activerecord-import" -gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-5" +#gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-6" gem "fog-aws", ">= 0.6.0" gem "catalog", path: "./engines/catalog" @@ -79,7 +79,7 @@ gem 'paper_trail', '~> 10.3.1' gem 'paperclip', '~> 3.4.1' gem 'rack-rewrite' gem 'rack-ssl', require: 'rack/ssl' -gem 'roadie-rails', '~> 2.2.0' +gem 'roadie-rails' gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis'] gem 'hiredis' @@ -113,6 +113,9 @@ gem 'jquery-migrate-rails' gem 'jquery-rails', '4.4.0' gem 'jquery-ui-rails', '~> 4.2' gem 'select2-rails', '~> 3.4.7' +# 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' gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4' diff --git a/Gemfile.lock b/Gemfile.lock index 832d504736..3fbec13ee3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,16 +4,6 @@ GIT specs: custom_error_message (1.1.1) -GIT - remote: https://github.com/openfoodfoundation/db2fog.git - revision: 8ceef362c64e6573d62d26db5ebb0c0f33cd3d61 - branch: rails-5 - specs: - db2fog (0.9.1) - activerecord (>= 3.2.0, < 6.0) - fog-core (~> 1.0) - rails (>= 3.2.0, < 6.0) - GIT remote: https://github.com/openfoodfoundation/ofn-qz.git revision: 467f6ea1c44529c7c91cac4c8211bbd863588c0b @@ -48,47 +38,57 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actioncable (5.2.6) - actionpack (= 5.2.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) + actionmailbox (6.0.3.6) + actionpack (= 6.0.3.6) + activejob (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) + mail (>= 2.7.1) + actionmailer (6.0.3.6) + actionpack (= 6.0.3.6) + actionview (= 6.0.3.6) + activejob (= 6.0.3.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) + actionpack (6.0.3.6) + actionview (= 6.0.3.6) + activesupport (= 6.0.3.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-action_caching (1.2.2) actionpack (>= 4.0.0) - actionview (5.2.6) - activesupport (= 5.2.6) + actiontext (6.0.3.6) + actionpack (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) + nokogiri (>= 1.8.5) + actionview (6.0.3.6) + activesupport (= 6.0.3.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (5.2.6) - activesupport (= 5.2.6) + activejob (6.0.3.6) + activesupport (= 6.0.3.6) globalid (>= 0.3.6) activemerchant (1.119.0) activesupport (>= 4.2) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) nokogiri (~> 1.4) - activemodel (5.2.6) - activesupport (= 5.2.6) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.6) - arel (>= 9.0) + activemodel (6.0.3.6) + activesupport (= 6.0.3.6) + activerecord (6.0.3.6) + activemodel (= 6.0.3.6) + activesupport (= 6.0.3.6) activerecord-import (1.1.0) activerecord (>= 3.2) activerecord-postgresql-adapter (0.0.1) @@ -99,15 +99,17 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 3) railties (>= 5.2.4.1) - activestorage (5.2.6) - actionpack (= 5.2.6) - activerecord (= 5.2.6) + activestorage (6.0.3.6) + actionpack (= 6.0.3.6) + activejob (= 6.0.3.6) + activerecord (= 6.0.3.6) marcel (~> 1.0.0) - activesupport (5.2.6) + activesupport (6.0.3.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) acts-as-taggable-on (7.0.0) activerecord (>= 5.0, < 6.2) acts_as_list (1.0.4) @@ -124,7 +126,6 @@ GEM railties (>= 3, < 7) angularjs-file-upload-rails (2.4.1) angularjs-rails (1.5.5) - arel (9.0.0) ast (2.4.2) awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) @@ -169,22 +170,12 @@ GEM coffee-script-source (1.12.2) combine_pdf (1.0.21) ruby-rc4 (>= 0.1.5) - compass (1.0.3) + compass (0.12.2) chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - compass-rails (4.0.0) - compass (~> 1.0.0) - sass-rails (< 5.1) - sprockets (< 4.0) + fssm (>= 0.2.7) + sass (~> 3.1) + compass-rails (2.0.0) + compass (>= 0.12.2) concurrent-ruby (1.1.8) connection_pool (2.2.5) crack (0.4.5) @@ -225,18 +216,22 @@ GEM erubi (1.10.0) et-orbi (1.2.4) tzinfo - excon (0.79.0) + excon (0.81.0) execjs (2.7.0) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.3.0) + faraday (1.4.1) + faraday-excon (~> 1.1) faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) + faraday-excon (1.1.0) faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) ffaker (2.18.0) ffi (1.15.0) figaro (1.2.0) @@ -250,15 +245,16 @@ GEM flipper (~> 0.20.4) rack (>= 1.4, < 3) rack-protection (>= 1.5.3, < 2.2.0) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.10.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.2.4) builder - excon (~> 0.58) + excon (~> 0.71) formatador (~> 0.2) + mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) @@ -275,6 +271,7 @@ GEM fugit (1.4.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) + fssm (0.2.10) fuubar (2.5.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -330,11 +327,11 @@ GEM kgio (2.11.3) knapsack (1.22.0) rake - launchy (2.4.3) - addressable (~> 2.3) + launchy (2.5.0) + addressable (~> 2.7) letter_opener (1.7.0) launchy (~> 2.2) - libv8-node (15.14.0.0) + libv8-node (15.14.0.1) loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -344,7 +341,7 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) + mime-types-data (3.2021.0225) mimemagic (0.4.3) nokogiri (~> 1) rake @@ -399,12 +396,12 @@ GEM ttfunk pg (1.2.3) power_assert (2.0.0) - pry (0.13.1) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.8.0) byebug (~> 11.0) - pry (~> 0.13.0) + pry (~> 0.10) public_suffix (4.0.6) raabro (1.4.0) racc (1.5.2) @@ -418,18 +415,20 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.6) - actioncable (= 5.2.6) - actionmailer (= 5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - activemodel (= 5.2.6) - activerecord (= 5.2.6) - activestorage (= 5.2.6) - activesupport (= 5.2.6) + rails (6.0.3.6) + actioncable (= 6.0.3.6) + actionmailbox (= 6.0.3.6) + actionmailer (= 6.0.3.6) + actionpack (= 6.0.3.6) + actiontext (= 6.0.3.6) + actionview (= 6.0.3.6) + activejob (= 6.0.3.6) + activemodel (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) bundler (>= 1.3.0) - railties (= 5.2.6) + railties (= 6.0.3.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -440,16 +439,16 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails-i18n (5.1.3) + rails-i18n (6.0.0) i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) + railties (>= 6.0.0, < 7) rails_safe_tasks (1.0.0) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) + railties (6.0.3.6) + actionpack (= 6.0.3.6) + activesupport (= 6.0.3.6) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.0.0) raindrops (0.19.1) rake (13.0.3) @@ -531,13 +530,13 @@ GEM rubocop (>= 1.7.0, < 2.0) ruby-progressbar (1.11.0) ruby-rc4 (0.1.5) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) rubyzip (2.3.0) rufus-scheduler (3.7.0) fugit (~> 1.1, >= 1.1.6) sass (3.4.25) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) + sass-rails (5.1.0) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) @@ -566,7 +565,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -585,7 +584,7 @@ GEM activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) stringex (2.8.5) - stripe (5.30.0) + stripe (5.32.1) temple (0.8.2) test-prof (1.0.5) test-unit (3.4.2) @@ -611,7 +610,7 @@ GEM unicorn-worker-killer (0.4.5) get_process_mem (~> 0) unicorn (>= 4, < 7) - uniform_notifier (1.14.1) + uniform_notifier (1.14.2) view_component (2.32.0) activesupport (>= 5.0.0, < 7.0) view_component_storybook (0.8.0) @@ -637,6 +636,7 @@ GEM xml-simple (1.1.8) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.4.2) PLATFORMS ruby @@ -672,7 +672,6 @@ DEPENDENCIES daemons dalli database_cleaner - db2fog! ddtrace debugger-linecache delayed_job_active_record @@ -725,7 +724,7 @@ DEPENDENCIES rack-mini-profiler (< 3.0.0) rack-rewrite rack-ssl - rails (~> 5.2) + rails (~> 6.0.3.6) rails-controller-testing rails-i18n rails_safe_tasks (~> 1.0) @@ -733,16 +732,16 @@ DEPENDENCIES redcarpet redis (>= 4.0) responders - roadie-rails (~> 2.2.0) + roadie-rails roo (~> 2.8.3) rspec-rails (>= 3.5.2) rspec-retry rswag rubocop rubocop-rails - sass (<= 4.7.1) + sass (~> 3.4.0) sass-rails (< 6.0.0) - select2-rails (~> 3.4.7) + select2-rails (~> 3.5.11) selenium-webdriver shoulda-matchers sidekiq @@ -755,6 +754,7 @@ DEPENDENCIES stripe test-prof test-unit (~> 3.4) + thor (~> 0.20) timecop uglifier (>= 1.0.3) unicorn-rails