diff --git a/Gemfile b/Gemfile index 9443d626..f5100168 100644 --- a/Gemfile +++ b/Gemfile @@ -2,14 +2,15 @@ ruby File.read(".ruby-version").strip source 'https://rubygems.org' -gem 'rails','~> 5.2' +gem 'rails','~> 6' gem 'workflow', '~> 2.0'#, github: 'geekq/workflow' gem 'workflow-activerecord', '>=4.1', '< 6.0' # Using community gems because official support does not cover Rails 5 # Consider refactor not to use them or find alternatives. # Gems hindering Rails 6 upgrade: -gem 'rocket_pants', git: 'https://github.com/parse/rocket_pants' +# +#gem 'rocket_pants', git: 'https://github.com/parse/rocket_pants' gem 'protected_attributes_continued' diff --git a/Gemfile.lock b/Gemfile.lock index d2e43240..bed8eeb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,41 +1,44 @@ -GIT - remote: https://github.com/parse/rocket_pants - revision: e2ac0bf239bca9edf4781fbc3f936bc7adb16931 - specs: - rocket_pants (1.13.1) - actionpack (>= 3.0, < 6.0) - api_smith - hashie (>= 1.0, < 4) - moneta - railties (>= 3.0, < 6.0) - will_paginate (~> 3.0) - GEM remote: https://rubygems.org/ specs: - actioncable (5.2.5) - actionpack (= 5.2.5) + actioncable (6.1.4.1) + actionpack (= 6.1.4.1) + activesupport (= 6.1.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.5) - actionpack (= 5.2.5) - actionview (= 5.2.5) - activejob (= 5.2.5) + actionmailbox (6.1.4.1) + actionpack (= 6.1.4.1) + activejob (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) + mail (>= 2.7.1) + actionmailer (6.1.4.1) + actionpack (= 6.1.4.1) + actionview (= 6.1.4.1) + activejob (= 6.1.4.1) + activesupport (= 6.1.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.5) - actionview (= 5.2.5) - activesupport (= 5.2.5) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.4.1) + actionview (= 6.1.4.1) + activesupport (= 6.1.4.1) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.5) - activesupport (= 5.2.5) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.4.1) + actionpack (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) + nokogiri (>= 1.8.5) + actionview (6.1.4.1) + activesupport (= 6.1.4.1) 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.10.12) actionpack (>= 4.1, < 6.2) activemodel (>= 4.1, < 6.2) @@ -50,37 +53,36 @@ GEM kaminari (~> 1.0, >= 1.2.1) railties (>= 5.2, < 6.2) ransack (~> 2.1, >= 2.1.1) - activejob (5.2.5) - activesupport (= 5.2.5) + activejob (6.1.4.1) + activesupport (= 6.1.4.1) globalid (>= 0.3.6) - activemodel (5.2.5) - activesupport (= 5.2.5) - activerecord (5.2.5) - activemodel (= 5.2.5) - activesupport (= 5.2.5) - arel (>= 9.0) - activestorage (5.2.5) - actionpack (= 5.2.5) - activerecord (= 5.2.5) + activemodel (6.1.4.1) + activesupport (= 6.1.4.1) + activerecord (6.1.4.1) + activemodel (= 6.1.4.1) + activesupport (= 6.1.4.1) + activestorage (6.1.4.1) + actionpack (= 6.1.4.1) + activejob (= 6.1.4.1) + activerecord (= 6.1.4.1) + activesupport (= 6.1.4.1) marcel (~> 1.0.0) - activesupport (5.2.5) + mini_mime (>= 1.1.0) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) acts-as-taggable-on (7.0.0) activerecord (>= 5.0, < 6.2) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ancestry (4.0.0) activerecord (>= 5.2.4.5) - api_smith (1.3.0) - hashie (>= 1.0, < 3.0) - httparty arbre (1.4.0) activesupport (>= 3.0.0, < 6.2) ruby2_keywords (>= 0.0.2, < 1.0) - arel (9.0.0) ast (2.4.2) authority (3.3.0) activesupport (>= 3.0.0) @@ -222,8 +224,8 @@ GEM gibbon (3.4.0) faraday (>= 0.16.0) multi_json (>= 1.11.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) groupdate (5.2.2) activesupport (>= 5) guard (2.16.2) @@ -253,7 +255,6 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) hashdiff (1.0.1) - hashie (2.1.2) highline (2.0.3) hiredis (0.6.3) hpricot (0.8.6) @@ -275,9 +276,6 @@ GEM ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) - httparty (0.18.1) - mime-types (~> 3.0) - multi_xml (>= 0.5.2) i18n (1.8.10) concurrent-ruby (~> 1.0) i18n-tasks (0.9.34) @@ -327,7 +325,7 @@ GEM listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.9.1) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) @@ -344,23 +342,21 @@ GEM nokogiri (~> 1) rake mini_mime (1.1.0) - mini_portile2 (2.5.3) + mini_portile2 (2.6.1) minitest (5.14.4) momentjs-rails (2.20.1) railties (>= 3.1) - moneta (1.4.1) msgpack (1.4.2) multi_json (1.15.0) - multi_xml (0.6.0) multipart-post (2.1.1) naught (1.1.0) nenv (0.3.0) nest (3.2.0) redic net-ssh (6.1.0) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nio4r (2.5.8) + nokogiri (1.12.3) + mini_portile2 (~> 2.6.1) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -374,7 +370,7 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) - parser (3.0.1.0) + parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) pg_search (2.3.5) @@ -419,18 +415,20 @@ GEM rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.5) - actioncable (= 5.2.5) - actionmailer (= 5.2.5) - actionpack (= 5.2.5) - actionview (= 5.2.5) - activejob (= 5.2.5) - activemodel (= 5.2.5) - activerecord (= 5.2.5) - activestorage (= 5.2.5) - activesupport (= 5.2.5) - bundler (>= 1.3.0) - railties (= 5.2.5) + rails (6.1.4.1) + actioncable (= 6.1.4.1) + actionmailbox (= 6.1.4.1) + actionmailer (= 6.1.4.1) + actionpack (= 6.1.4.1) + actiontext (= 6.1.4.1) + actionview (= 6.1.4.1) + activejob (= 6.1.4.1) + activemodel (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) + bundler (>= 1.15.0) + railties (= 6.1.4.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -439,19 +437,19 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.1) loofah (~> 2.3) - rails-i18n (5.1.3) + rails-i18n (6.0.0) i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) - railties (5.2.5) - actionpack (= 5.2.5) - activesupport (= 5.2.5) + railties (>= 6.0.0, < 7) + railties (6.1.4.1) + actionpack (= 6.1.4.1) + activesupport (= 6.1.4.1) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 0.13) + thor (~> 1.0) rainbow (3.0.0) - rake (13.0.3) + rake (13.0.6) ransack (2.4.2) activerecord (>= 5.2.4) activesupport (>= 5.2.4) @@ -566,8 +564,8 @@ GEM sprockets (>= 3.0.0) stamp (0.6.0) temple (0.8.2) - terminal-table (3.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.1) + unicode-display_width (>= 1.1.1, < 3) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) test-unit (3.4.1) @@ -591,14 +589,14 @@ GEM multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unicode-display_width (2.0.0) unicode_utils (1.4.0) uniform_notifier (1.14.2) web-console (3.7.0) @@ -610,10 +608,9 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - will_paginate (3.3.0) workflow (2.0.2) workflow-activerecord (4.1.8) activerecord (>= 3.0, < 6.2) @@ -621,6 +618,7 @@ GEM xml-simple (1.1.8) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.4.2) zonebie (0.6.1) PLATFORMS @@ -695,14 +693,13 @@ DEPENDENCIES rack-cache rack-cors rack-mini-profiler - rails (~> 5.2) + rails (~> 6) rails-controller-testing ransack recaptcha record_tag_helper redcarpet redis - rocket_pants! rolify rspec rspec-rails