diff --git a/Gemfile b/Gemfile index e417bda2..4ca25103 100644 --- a/Gemfile +++ b/Gemfile @@ -21,14 +21,14 @@ gem 'devise' gem 'cancan' # or cancancan gem 'draper' gem 'pundit' -gem 'audited', '~> 4.7' +gem 'audited', '~> 5.1' gem 'aasm' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.1' -gem 'activesupport', '~> 6.1' -gem 'actionpack', '~> 6.1' +gem 'rails', '~> 7.0' +gem 'activesupport', '~> 7.0' +gem 'actionpack', '~> 7.0' gem 'net-smtp', require: false gem 'net-imap', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 5c88fa44..09d2fec7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,40 +3,47 @@ GEM specs: aasm (5.4.0) concurrent-ruby (~> 1.0) - actioncable (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + actioncable (7.0.4.1) + actionpack (= 7.0.4.1) + activesupport (= 7.0.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actionmailbox (7.0.4.1) + actionpack (= 7.0.4.1) + activejob (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) mail (>= 2.7.1) - actionmailer (6.1.7) - actionpack (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activesupport (= 6.1.7) + net-imap + net-pop + net-smtp + actionmailer (7.0.4.1) + actionpack (= 7.0.4.1) + actionview (= 7.0.4.1) + activejob (= 7.0.4.1) + activesupport (= 7.0.4.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.4.1) + actionview (= 7.0.4.1) + activesupport (= 7.0.4.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7) - actionpack (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actiontext (7.0.4.1) + actionpack (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7) - activesupport (= 6.1.7) + actionview (7.0.4.1) + activesupport (= 7.0.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -54,31 +61,30 @@ GEM activeadmin jquery-rails select2-rails - activejob (6.1.7) - activesupport (= 6.1.7) + activejob (7.0.4.1) + activesupport (= 7.0.4.1) globalid (>= 0.3.6) - activemodel (6.1.7) - activesupport (= 6.1.7) + activemodel (7.0.4.1) + activesupport (= 7.0.4.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) - activestorage (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activesupport (= 6.1.7) + activerecord (7.0.4.1) + activemodel (= 7.0.4.1) + activesupport (= 7.0.4.1) + activestorage (7.0.4.1) + actionpack (= 7.0.4.1) + activejob (= 7.0.4.1) + activerecord (= 7.0.4.1) + activesupport (= 7.0.4.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7) + activesupport (7.0.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) airrecord (1.0.5) @@ -87,8 +93,8 @@ GEM arbre (1.5.0) activesupport (>= 3.0.0, < 7.1) ruby2_keywords (>= 0.0.2, < 1.0) - audited (4.10.0) - activerecord (>= 4.2, < 6.2) + audited (5.1.0) + activerecord (>= 5.0, < 7.1) autoprefixer-rails (10.4.7.0) execjs (~> 2) bcrypt (3.1.18) @@ -133,7 +139,7 @@ GEM activesupport (>= 5.0) request_store (>= 1.0) ruby2_keywords - erubi (1.11.0) + erubi (1.12.0) execjs (2.8.1) faraday (1.10.2) faraday-em_http (~> 1.0) @@ -167,7 +173,7 @@ GEM actionpack (>= 5.2.0) formtastic_i18n (0.7.0) gli (2.21.0) - globalid (1.0.0) + globalid (1.0.1) activesupport (>= 5.0) has_scope (0.8.0) actionpack (>= 5.2) @@ -211,11 +217,14 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.0.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) @@ -226,8 +235,8 @@ GEM nokogiri (~> 1) rake mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) + mini_portile2 (2.8.1) + minitest (5.17.0) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.2.3) @@ -241,7 +250,7 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.13.9) + nokogiri (1.14.0) mini_portile2 (~> 2.8.0) racc (~> 1.4) oauth2 (1.4.11) @@ -269,36 +278,36 @@ GEM nio4r (~> 2.0) pundit (2.2.0) activesupport (>= 3.0.0) - racc (1.6.0) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) - rails (6.1.7) - actioncable (= 6.1.7) - actionmailbox (= 6.1.7) - actionmailer (= 6.1.7) - actionpack (= 6.1.7) - actiontext (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activemodel (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + rails (7.0.4.1) + actioncable (= 7.0.4.1) + actionmailbox (= 7.0.4.1) + actionmailer (= 7.0.4.1) + actionpack (= 7.0.4.1) + actiontext (= 7.0.4.1) + actionview (= 7.0.4.1) + activejob (= 7.0.4.1) + activemodel (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) bundler (>= 1.15.0) - railties (= 6.1.7) - sprockets-rails (>= 2.0.0) + railties (= 7.0.4.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.1) + actionpack (= 7.0.4.1) + activesupport (= 7.0.4.1) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rake (13.0.6) ransack (3.2.1) activerecord (>= 6.1.5) @@ -392,19 +401,19 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.4) + zeitwerk (2.6.6) PLATFORMS ruby DEPENDENCIES aasm - actionpack (~> 6.1) + actionpack (~> 7.0) activeadmin activeadmin-select2 - activesupport (~> 6.1) + activesupport (~> 7.0) airrecord (= 1.0.5) - audited (~> 4.7) + audited (~> 5.1) bootstrap (~> 4.3.1) byebug cancan @@ -427,7 +436,7 @@ DEPENDENCIES pry puma (~> 5.5) pundit - rails (~> 6.1) + rails (~> 7.0) sass-rails (~> 5.0) select2-rails selenium-webdriver