diff --git a/Gemfile b/Gemfile index 03e547ca7b..97cae4c5ee 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ git_source(:github) do |repo_name| end gem 'activerecord-session_store' -gem "authlogic", "4.4.2" +gem "authlogic", "6.4.2" gem 'authlogic-oid' gem "composite_primary_keys" gem 'figaro' # To easily test OAuth providers in the development mode @@ -43,10 +43,10 @@ gem "php-serialize", :require => "php_serialize" gem 'rack-cors', :require => 'rack/cors' gem "rack-openid" gem "rack-test", "1.1.0" -gem 'rails', '5.2.7' +gem 'rails', '7.0.2.3' gem 'rails-controller-testing' gem 'rails-dom-testing' -gem 'rails-i18n', '~> 5.1.3' +gem 'rails-i18n', '~> 7.0.3' gem 'rails_autolink' gem 'rb-readline' gem 'rdiscount', '~> 2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 615edde6e8..c34a4dd0af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,63 +3,86 @@ GEM specs: action-cable-testing (0.6.1) actioncable (>= 5.0) - actioncable (5.2.7) - actionpack (= 5.2.7) + actioncable (7.0.2.3) + actionpack (= 7.0.2.3) + activesupport (= 7.0.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) + actionmailbox (7.0.2.3) + actionpack (= 7.0.2.3) + activejob (= 7.0.2.3) + activerecord (= 7.0.2.3) + activestorage (= 7.0.2.3) + activesupport (= 7.0.2.3) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.2.3) + actionpack (= 7.0.2.3) + actionview (= 7.0.2.3) + activejob (= 7.0.2.3) + activesupport (= 7.0.2.3) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (5.2.7) - actionview (= 5.2.7) - activesupport (= 5.2.7) - rack (~> 2.0, >= 2.0.8) + actionpack (7.0.2.3) + actionview (= 7.0.2.3) + activesupport (= 7.0.2.3) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.7) - activesupport (= 5.2.7) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.2.3) + actionpack (= 7.0.2.3) + activerecord (= 7.0.2.3) + activestorage (= 7.0.2.3) + activesupport (= 7.0.2.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.2.3) + activesupport (= 7.0.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.7) - activesupport (= 5.2.7) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.2.3) + activesupport (= 7.0.2.3) globalid (>= 0.3.6) - activemodel (5.2.7) - activesupport (= 5.2.7) - activerecord (5.2.7) - activemodel (= 5.2.7) - activesupport (= 5.2.7) - arel (>= 9.0) + activemodel (7.0.2.3) + activesupport (= 7.0.2.3) + activerecord (7.0.2.3) + activemodel (= 7.0.2.3) + activesupport (= 7.0.2.3) activerecord-session_store (2.0.0) actionpack (>= 5.2.4.1) activerecord (>= 5.2.4.1) multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 3) railties (>= 5.2.4.1) - activestorage (5.2.7) - actionpack (= 5.2.7) - activerecord (= 5.2.7) - marcel (~> 1.0.0) - activesupport (5.2.7) + activestorage (7.0.2.3) + actionpack (= 7.0.2.3) + activejob (= 7.0.2.3) + activerecord (= 7.0.2.3) + activesupport (= 7.0.2.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.2.3) 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) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ansi (1.5.0) - arel (9.0.0) ast (2.4.2) - authlogic (4.4.2) - activerecord (>= 4.2, < 5.3) - activesupport (>= 4.2, < 5.3) + authlogic (6.4.2) + activemodel (>= 5.2, < 7.1) + activerecord (>= 5.2, < 7.1) + activesupport (>= 5.2, < 7.1) request_store (~> 1.0) - scrypt (>= 1.2, < 4.0) authlogic-oid (1.0.4) authlogic babel-source (5.8.35) @@ -97,8 +120,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (11.3.1) - activerecord (~> 5.2.4) + composite_primary_keys (14.0.4) + activerecord (~> 7.0.2) concurrent-ruby (1.1.10) connection_pool (2.2.5) crack (0.4.5) @@ -109,6 +132,7 @@ GEM delayed_job (4.1.10) activesupport (>= 3.0, < 8.0) diff-lcs (1.5.0) + digest (3.1.0) digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) docile (1.4.0) @@ -318,7 +342,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loadcss-rails (2.0.1) - loofah (2.15.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -361,10 +385,24 @@ GEM mustermann (>= 1.0.0) mysql2 (0.5.3) naught (1.1.0) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout netrc (0.11.0) nifty-generators (0.4.6) nio4r (2.5.8) - nokogiri (1.13.3) + nokogiri (1.13.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) nokogumbo (2.0.4) @@ -440,19 +478,20 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.7) - actioncable (= 5.2.7) - actionmailer (= 5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) - activemodel (= 5.2.7) - activerecord (= 5.2.7) - activestorage (= 5.2.7) - activesupport (= 5.2.7) - bundler (>= 1.3.0) - railties (= 5.2.7) - sprockets-rails (>= 2.0.0) + rails (7.0.2.3) + actioncable (= 7.0.2.3) + actionmailbox (= 7.0.2.3) + actionmailer (= 7.0.2.3) + actionpack (= 7.0.2.3) + actiontext (= 7.0.2.3) + actionview (= 7.0.2.3) + activejob (= 7.0.2.3) + activemodel (= 7.0.2.3) + activerecord (= 7.0.2.3) + activestorage (= 7.0.2.3) + activesupport (= 7.0.2.3) + bundler (>= 1.15.0) + railties (= 7.0.2.3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -462,18 +501,19 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails-i18n (5.1.3) + rails-i18n (7.0.3) i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) + railties (>= 6.0.0, < 8) rails-perftest (0.0.7) rails_autolink (1.1.6) rails (> 3.1) - railties (5.2.7) - actionpack (= 5.2.7) - activesupport (= 5.2.7) + railties (7.0.2.3) + actionpack (= 7.0.2.3) + activesupport (= 7.0.2.3) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.0) @@ -481,7 +521,7 @@ GEM ffi (~> 1.0) rb-readline (0.5.5) rdiscount (2.2.0.2) - react-rails (2.6.1) + react-rails (2.6.2) babel-transpiler (>= 0.7.0) connection_pool execjs @@ -497,7 +537,7 @@ GEM declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) - request_store (1.4.1) + request_store (1.5.1) rack (>= 1.4) responders (3.0.1) actionpack (>= 5.0) @@ -621,8 +661,9 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.2) - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) + strscan (3.0.1) + teaspoon (1.2.2) + railties (>= 3.2.5) teaspoon-mocha (2.3.3) teaspoon (>= 1.0.0) terrapin (0.6.0) @@ -633,6 +674,7 @@ GEM thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.5) + timeout (0.2.0) trailblazer-option (0.1.2) turbolinks (5.2.1) turbolinks-source (~> 5.2) @@ -648,8 +690,8 @@ 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) uber (0.1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -684,6 +726,7 @@ GEM will_paginate (~> 3.0, >= 3.0.0) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.5.4) PLATFORMS ruby @@ -691,7 +734,7 @@ PLATFORMS DEPENDENCIES action-cable-testing activerecord-session_store - authlogic (= 4.4.2) + authlogic (= 6.4.2) authlogic-oid byebug capybara @@ -755,10 +798,10 @@ DEPENDENCIES rack-cors rack-openid rack-test (= 1.1.0) - rails (= 5.2.7) + rails (= 7.0.2.3) rails-controller-testing rails-dom-testing - rails-i18n (~> 5.1.3) + rails-i18n (~> 7.0.3) rails-perftest rails_autolink rake (~> 13.0.6)