diff --git a/.ruby-version b/.ruby-version index 75a22a26a..ef538c281 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.3 +3.1.2 diff --git a/Gemfile b/Gemfile index e210be466..c6490706d 100644 --- a/Gemfile +++ b/Gemfile @@ -55,6 +55,10 @@ gem 'listen' # Required by ActiveSupport::EventedFileUpdateChecker gem 'lograge' gem 'logstash-event' gem 'mailjet', require: false +gem 'matrix' # needed by prawn and not default in ruby 3.1 +gem 'net-imap', require: false # See https://github.com/mikel/mail/pull/1439 +gem 'net-pop', require: false # same +gem 'net-smtp', require: false # same gem 'openid_connect' gem 'pg' gem 'phonelib' diff --git a/Gemfile.lock b/Gemfile.lock index 4485809aa..2f4e96baa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,40 +4,40 @@ GEM aasm (5.2.0) concurrent-ruby (~> 1.0) acsv (0.0.1) - actioncable (6.1.4.7) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + actioncable (6.1.5) + actionpack (= 6.1.5) + activesupport (= 6.1.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.7) - actionpack (= 6.1.4.7) - activejob (= 6.1.4.7) - activerecord (= 6.1.4.7) - activestorage (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionmailbox (6.1.5) + actionpack (= 6.1.5) + activejob (= 6.1.5) + activerecord (= 6.1.5) + activestorage (= 6.1.5) + activesupport (= 6.1.5) mail (>= 2.7.1) - actionmailer (6.1.4.7) - actionpack (= 6.1.4.7) - actionview (= 6.1.4.7) - activejob (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionmailer (6.1.5) + actionpack (= 6.1.5) + actionview (= 6.1.5) + activejob (= 6.1.5) + activesupport (= 6.1.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.7) - actionview (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionpack (6.1.5) + actionview (= 6.1.5) + activesupport (= 6.1.5) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.7) - actionpack (= 6.1.4.7) - activerecord (= 6.1.4.7) - activestorage (= 6.1.4.7) - activesupport (= 6.1.4.7) + actiontext (6.1.5) + actionpack (= 6.1.5) + activerecord (= 6.1.5) + activestorage (= 6.1.5) + activesupport (= 6.1.5) nokogiri (>= 1.8.5) - actionview (6.1.4.7) - activesupport (= 6.1.4.7) + actionview (6.1.5) + activesupport (= 6.1.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -55,26 +55,26 @@ GEM activemodel (>= 5.2.0) activestorage (>= 5.2.0) activesupport (>= 5.2.0) - activejob (6.1.4.7) - activesupport (= 6.1.4.7) + activejob (6.1.5) + activesupport (= 6.1.5) globalid (>= 0.3.6) - activemodel (6.1.4.7) - activesupport (= 6.1.4.7) - activerecord (6.1.4.7) - activemodel (= 6.1.4.7) - activesupport (= 6.1.4.7) - activestorage (6.1.4.7) - actionpack (= 6.1.4.7) - activejob (= 6.1.4.7) - activerecord (= 6.1.4.7) - activesupport (= 6.1.4.7) - marcel (~> 1.0.0) + activemodel (6.1.5) + activesupport (= 6.1.5) + activerecord (6.1.5) + activemodel (= 6.1.5) + activesupport (= 6.1.5) + activestorage (6.1.5) + actionpack (= 6.1.5) + activejob (= 6.1.5) + activerecord (= 6.1.5) + activesupport (= 6.1.5) + marcel (~> 1.0) mini_mime (>= 1.1.0) activestorage-openstack (1.5.1) fog-openstack (~> 1.0) marcel rails (>= 5.2.2) - activesupport (6.1.4.7) + activesupport (6.1.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -126,6 +126,14 @@ GEM babel-source (>= 4.0, < 6) execjs (~> 2.0) bcrypt (3.1.16) + better_html (1.0.16) + actionview (>= 4.0) + activesupport (>= 4.0) + ast (~> 2.0) + erubi (~> 1.4) + html_tokenizer (~> 0.0.6) + parser (>= 2.4) + smart_properties bindata (2.4.10) bindex (0.8.1) bootsnap (1.9.3) @@ -164,7 +172,7 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.3) content_disposition (1.0.0) crack (0.4.5) @@ -202,13 +210,14 @@ GEM devise (>= 4.0) devise-i18n (1.9.2) devise (>= 4.7.1) - devise-two-factor (4.0.0) - activesupport (< 6.2) + devise-two-factor (4.0.2) + activesupport (< 7.1) attr_encrypted (>= 1.3, < 4, != 2) devise (~> 4.0) - railties (< 6.2) + railties (< 7.1) rotp (~> 6.0) diff-lcs (1.4.4) + digest (3.1.0) discard (1.2.0) activerecord (>= 4.2, < 7) domain_name (0.5.20190701) @@ -329,6 +338,7 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) + html_tokenizer (0.0.7) htmlentities (4.3.4) http-accept (1.7.0) http-cookie (1.0.3) @@ -337,9 +347,10 @@ GEM httpclient (2.8.3) i18n (1.10.0) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.33) + i18n-tasks (1.0.9) activesupport (>= 4.0.2) ast (>= 2.1.0) + better_html (~> 1.0) erubi highline (>= 2.0.0) i18n @@ -355,6 +366,7 @@ GEM ruby-vips (>= 2.0.17, < 3) invisible_captcha (2.0.0) rails (>= 5.0) + io-wait (0.2.1) ipaddress (0.8.3) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) @@ -401,7 +413,7 @@ GEM railties (>= 4) request_store (~> 1.0) logstash-event (1.2.02) - loofah (2.14.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -411,6 +423,7 @@ GEM rack (>= 1.4.0) rest-client (>= 2.0.0) marcel (1.0.2) + matrix (0.4.2) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) @@ -429,6 +442,19 @@ GEM multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.1) + io-wait + timeout + net-smtp (0.2.1) + net-protocol netrc (0.11.0) nio4r (2.5.8) nokogiri (1.13.4) @@ -447,7 +473,7 @@ GEM webfinger (>= 1.0.1) orm_adapter (0.5.0) parallel (1.20.1) - parser (3.0.0.0) + parser (3.1.2.0) ast (~> 2.4.1) pdf-core (0.9.0) pg (1.2.3) @@ -502,20 +528,20 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.4.7) - actioncable (= 6.1.4.7) - actionmailbox (= 6.1.4.7) - actionmailer (= 6.1.4.7) - actionpack (= 6.1.4.7) - actiontext (= 6.1.4.7) - actionview (= 6.1.4.7) - activejob (= 6.1.4.7) - activemodel (= 6.1.4.7) - activerecord (= 6.1.4.7) - activestorage (= 6.1.4.7) - activesupport (= 6.1.4.7) + rails (6.1.5) + actioncable (= 6.1.5) + actionmailbox (= 6.1.5) + actionmailer (= 6.1.5) + actionpack (= 6.1.5) + actiontext (= 6.1.5) + actionview (= 6.1.5) + activejob (= 6.1.5) + activemodel (= 6.1.5) + activerecord (= 6.1.5) + activestorage (= 6.1.5) + activesupport (= 6.1.5) bundler (>= 1.15.0) - railties (= 6.1.4.7) + railties (= 6.1.5) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -531,16 +557,16 @@ GEM ruby-graphviz (~> 1.2) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails-i18n (6.0.0) + rails-i18n (7.0.3) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 7) - railties (6.1.4.7) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + railties (>= 6.0.0, < 8) + railties (6.1.5) + actionpack (= 6.1.5) + activesupport (= 6.1.5) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rake-progressbar (0.0.5) rb-fsevent (0.10.4) @@ -677,6 +703,7 @@ GEM tilt (~> 2.0) skylight (5.0.1) activesupport (>= 5.2.0) + smart_properties (1.17.0) spreadsheet_architect (4.1.0) axlsx_styler (>= 1.0.0, < 2) caxlsx (>= 2.0.2, < 4) @@ -693,18 +720,20 @@ GEM sprockets (>= 3.0.0) strong_migrations (0.8.0) activerecord (>= 5.2) + strscan (3.0.1) swd (1.3.0) activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) sysexits (1.2.0) temple (0.8.2) - terminal-table (3.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.4) + timeout (0.1.1) ttfunk (1.7.0) typhoeus (1.4.0) ethon (>= 0.9.0) @@ -713,7 +742,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unicode-display_width (2.1.0) uri_template (0.7.0) validate_email (0.1.6) activemodel (>= 3.0) @@ -835,7 +864,11 @@ DEPENDENCIES lograge logstash-event mailjet + matrix mina + net-imap + net-pop + net-smtp openid_connect pg phonelib @@ -890,4 +923,4 @@ DEPENDENCIES zxcvbn-ruby BUNDLED WITH - 2.2.32 + 2.3.11