diff --git a/.github/workflows/rails-tests.yml b/.github/workflows/rails-tests.yml index 490d66acb..19e412137 100644 --- a/.github/workflows/rails-tests.yml +++ b/.github/workflows/rails-tests.yml @@ -29,7 +29,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev git - name: Configure sysctl limits @@ -40,12 +40,9 @@ jobs: sudo sysctl -w fs.file-max=262144 sudo sysctl -w vm.max_map_count=262144 - name: Set up Ruby - # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, - # change this to (see https://github.com/ruby/setup-ruby#versioning): - # uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@v1.100.0 + uses: ruby/setup-ruby@v1 with: - ruby-version: jruby-9.3.4.0 + ruby-version: jruby-9.3.9.0 bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Configure externals run: bundle exec cap local externals:setup @@ -61,7 +58,7 @@ jobs: DATABASE_HOSTNAME: localhost DATABASE_POOL: 16 - name: Upload test logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: logs diff --git a/.ruby-version b/.ruby-version index 33a1367d6..c585ad36d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -jruby-9.3.4.0 +jruby-9.3.9.0 diff --git a/Dockerfile b/Dockerfile index b7ec14bf4..0720f0420 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal +FROM ubuntu:jammy MAINTAINER Ryan Baumann # Install the Ubuntu packages. @@ -23,7 +23,7 @@ RUN git clone https://github.com/rbenv/rbenv.git .rbenv ENV PATH /root/.rbenv/bin:/root/.rbenv/shims:$PATH RUN echo 'eval "$(rbenv init -)"' > /etc/profile.d/rbenv.sh RUN chmod +x /etc/profile.d/rbenv.sh -RUN git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build && cd "$(rbenv root)"/plugins/ruby-build && git checkout v20220324 +RUN git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build && cd "$(rbenv root)"/plugins/ruby-build && git checkout v20221116 RUN git clone https://github.com/rbenv/rbenv-vars.git $(rbenv root)/plugins/rbenv-vars # Copy in secret files diff --git a/Gemfile b/Gemfile index a7cded880..3af17b7a6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,13 @@ # Edit this Gemfile to bundle your application's dependencies. # This preamble is the current preamble for Rails 3 apps; edit as needed. source 'https://rubygems.org' -ruby '2.6.8', engine: 'jruby', engine_version: '9.3.4.0' +ruby '2.6.8', engine: 'jruby', engine_version: '9.3.9.0' gem 'rails', '~> 6.1.5' # Needed for the new asset pipeline gem 'coffee-rails' -gem 'sass-rails', '~> 5' +gem 'sass-rails', '~> 6' gem 'therubyrhino' gem 'uglifier', '>= 1.0.3' @@ -17,7 +17,6 @@ group :test do gem 'mocha' gem 'rails-controller-testing' gem 'rake' - gem 'shoulda' gem 'shoulda-context' gem 'shoulda-matchers' end @@ -56,15 +55,15 @@ gem 'omniauth-google-oauth2' gem 'omniauth-rails_csrf_protection' gem 'pry', '~> 0.14.0' gem 'pry-rails', '~> 0.3.9' -gem 'puma', '>= 5.6.2' +gem 'puma', '< 7' gem 'rack', '>= 1.1.0' -gem 'rack-attack', '~> 4.0' +gem 'rack-attack', '~> 6.0' gem 'rapporteur' gem 'rexml' -gem 'rubyzip', '~> 1.0' +gem 'rubyzip', '~> 2' gem 'silencer' -gem 'sucker_punch', '~> 2.0' +gem 'sucker_punch', '~> 3.0' gem 'tzinfo-data', platform: :jruby -gem 'warbler', '~> 2.0' +gem 'webrick' gem 'with_advisory_lock' gem 'zip-zip' diff --git a/Gemfile.lock b/Gemfile.lock index be35e8d74..fa369856c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,64 +1,64 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.5.1) - actionpack (= 6.1.5.1) - activesupport (= 6.1.5.1) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.5.1) - actionpack (= 6.1.5.1) - activejob (= 6.1.5.1) - activerecord (= 6.1.5.1) - activestorage (= 6.1.5.1) - activesupport (= 6.1.5.1) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.1.5.1) - actionpack (= 6.1.5.1) - actionview (= 6.1.5.1) - activejob (= 6.1.5.1) - activesupport (= 6.1.5.1) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.5.1) - actionview (= 6.1.5.1) - activesupport (= 6.1.5.1) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-page_caching (1.2.4) actionpack (>= 4.0.0) - actiontext (6.1.5.1) - actionpack (= 6.1.5.1) - activerecord (= 6.1.5.1) - activestorage (= 6.1.5.1) - activesupport (= 6.1.5.1) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.1.5.1) - activesupport (= 6.1.5.1) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.5.1) - activesupport (= 6.1.5.1) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.1.5.1) - activesupport (= 6.1.5.1) - activerecord (6.1.5.1) - activemodel (= 6.1.5.1) - activesupport (= 6.1.5.1) - activerecord-jdbc-adapter (61.1-java) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activerecord-jdbc-adapter (61.2-java) activerecord (~> 6.1.0) - activerecord-jdbcmysql-adapter (61.1-java) - activerecord-jdbc-adapter (= 61.1) + activerecord-jdbcmysql-adapter (61.2-java) + activerecord-jdbc-adapter (= 61.2) jdbc-mysql (>= 5.1.36, < 9) - activerecord-jdbcpostgresql-adapter (61.1-java) - activerecord-jdbc-adapter (= 61.1) + activerecord-jdbcpostgresql-adapter (61.2-java) + activerecord-jdbc-adapter (= 61.2) jdbc-postgres (>= 9.4, < 43) - activerecord-jdbcsqlite3-adapter (61.1-java) - activerecord-jdbc-adapter (= 61.1) + activerecord-jdbcsqlite3-adapter (61.2-java) + activerecord-jdbc-adapter (= 61.2) jdbc-sqlite3 (~> 3.8, < 3.30) activerecord-session_store (2.0.0) actionpack (>= 5.2.4.1) @@ -66,28 +66,28 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 3) railties (>= 5.2.4.1) - activestorage (6.1.5.1) - actionpack (= 6.1.5.1) - activejob (= 6.1.5.1) - activerecord (= 6.1.5.1) - activesupport (= 6.1.5.1) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.5.1) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - airbrake (13.0.0) + airbrake (13.0.3) airbrake-ruby (~> 6.0) - airbrake-ruby (6.1.0) + airbrake-ruby (6.2.0) rbtree3 (~> 0.5) - airbrake-ruby (6.1.0-java) + airbrake-ruby (6.2.0-java) rbtree-jruby (~> 0.2) ast (2.4.2) - bcrypt (3.1.17) - bcrypt (3.1.17-java) + bcrypt (3.1.18) + bcrypt (3.1.18-java) builder (3.2.4) capistrano (2.15.9) highline @@ -103,161 +103,174 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) - database_cleaner-active_record (2.0.1) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - devise (4.8.1) + date (3.3.3) + date (3.3.3-java) + devise (4.9.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) dynamic_form (1.1.4) - erubi (1.10.0) - erubis (2.7.0) + erubi (1.12.0) execjs (2.8.1) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (2.2.0) - faraday-net_http (~> 2.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (2.0.2) + faraday-net_http (3.0.2) ffi (1.15.5) ffi (1.15.5-java) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.1.1) + temple (>= 0.8.2) + thor tilt - haml-rails (2.0.1) + haml (6.1.1-java) + temple (>= 0.8.2) + thor + tilt + haml-rails (2.1.0) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) + haml (>= 4.0.6) railties (>= 5.1) handle_invalid_percent_encoding_requests (1.1.1) rack-utf8_sanitizer rails (>= 3.1) hashie (5.0.0) - highline (2.0.3) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) + highline (2.1.0) httpclient (2.8.3) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) jdbc-mysql (8.0.27) jdbc-postgres (42.2.25) jdbc-sqlite3 (3.28.0) - jquery-rails (4.4.0) + jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jruby-jars (9.3.4.0) - jruby-rack (1.1.21) - json (2.6.1) - json (2.6.1-java) - jwt (2.3.0) - loofah (2.17.0) + jruby-jars (9.3.9.0) + json (2.6.3) + json (2.6.3-java) + jwt (2.7.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.15.0) - mocha (1.14.0) + minitest (5.18.0) + mocha (2.0.2) + ruby2_keywords (>= 0.0.5) multi_json (1.15.0) multi_xml (0.6.0) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) - net-sftp (3.0.0) - net-ssh (>= 5.0.0, < 7.0.0) - net-ssh (6.1.0) + net-imap (0.3.4) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-smtp (0.3.3) + net-protocol + net-ssh (7.1.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) nio4r (2.5.8) nio4r (2.5.8-java) - nokogiri (1.13.4-java) + nokogiri (1.13.10-java) racc (~> 1.4) - nokogiri (1.13.4-x86_64-linux) + nokogiri (1.13.10-x86_64-linux) racc (~> 1.4) - oauth2 (1.4.9) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (2.1.0) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + omniauth (2.1.1) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-google-oauth2 (1.0.1) + omniauth-google-oauth2 (1.1.1) jwt (>= 2.0) - oauth2 (~> 1.1) + oauth2 (~> 2.0.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8.0) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) - omniauth-oauth2 (1.7.2) - oauth2 (~> 1.4) - omniauth (>= 1.9, < 3) omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) omniauth (~> 2.0) orm_adapter (0.5.0) parallel (1.22.1) - parser (3.1.2.0) + parser (3.2.1.1) ast (~> 2.4.1) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry (0.14.1-java) + pry (0.14.2-java) coderay (~> 1.1) method_source (~> 1.0) spoon (~> 0.0) pry-rails (0.3.9) pry (>= 0.10.4) - puma (5.6.4) + puma (6.1.1) nio4r (~> 2.0) - puma (5.6.4-java) + puma (6.1.1-java) nio4r (~> 2.0) - racc (1.6.0) - racc (1.6.0-java) - rack (2.2.3) - rack-attack (4.4.1) - rack - rack-protection (2.2.0) - rack - rack-test (1.1.0) + racc (1.6.2) + racc (1.6.2-java) + rack (2.2.6.4) + rack-attack (6.6.1) rack (>= 1.0, < 3) - rack-utf8_sanitizer (1.7.0) - rack (>= 1.0, < 3.0) - rails (6.1.5.1) - actioncable (= 6.1.5.1) - actionmailbox (= 6.1.5.1) - actionmailer (= 6.1.5.1) - actionpack (= 6.1.5.1) - actiontext (= 6.1.5.1) - actionview (= 6.1.5.1) - activejob (= 6.1.5.1) - activemodel (= 6.1.5.1) - activerecord (= 6.1.5.1) - activestorage (= 6.1.5.1) - activesupport (= 6.1.5.1) + rack-protection (3.0.5) + rack + rack-test (2.1.0) + rack (>= 1.3) + rack-utf8_sanitizer (1.8.0) + rack (>= 1.0, < 4.0) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) bundler (>= 1.15.0) - railties (= 6.1.5.1) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -266,11 +279,11 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (6.1.5.1) - actionpack (= 6.1.5.1) - activesupport (= 6.1.5.1) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -278,93 +291,93 @@ GEM rake (13.0.6) rapporteur (3.8.0) i18n (>= 0.6, < 2) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rbtree-jruby (0.2.1) rbtree3 (0.7.0) - regexp_parser (2.3.1) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + regexp_parser (2.7.0) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) rexml (3.2.5) - rubocop (1.28.2) + rubocop (1.48.1) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.17.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.26.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) - parser (>= 3.1.1.0) - rubocop-minitest (0.19.1) - rubocop (>= 0.90, < 2.0) - rubocop-performance (1.13.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.27.0) + parser (>= 3.2.1.0) + rubocop-minitest (0.29.0) + rubocop (>= 1.39, < 2.0) + rubocop-performance (1.16.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.18.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - ruby_parser (3.19.1) - sexp_processor (~> 4.16) - rubyzip (1.3.0) + rubyzip (2.3.2) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.1.0) - railties (>= 5.2.0) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sexp_processor (4.16.1) - shoulda (4.0.0) - shoulda-context (~> 2.0) - shoulda-matchers (~> 4.0) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt shoulda-context (2.0.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) + shoulda-matchers (5.3.0) + activesupport (>= 5.2.0) silencer (2.0.0) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) spoon (0.0.6) ffi - sprockets (3.7.2) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sucker_punch (2.1.2) + sucker_punch (3.1.0) concurrent-ruby (~> 1.0) - temple (0.8.2) + temple (0.10.0) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) thor (1.2.1) - tilt (2.0.10) - tzinfo (2.0.4) + tilt (2.1.0) + timeout (0.3.2) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2022.1) + tzinfo-data (1.2022.7) tzinfo (>= 1.0.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.1.0) - warbler (2.0.5) - jruby-jars (>= 9.0.0.0) - jruby-rack (>= 1.1.1, < 1.3) - rake (>= 10.1.0) - rubyzip (~> 1.0, < 1.4) + unicode-display_width (2.4.2) + version_gem (1.1.1) warden (1.2.9) rack (>= 2.0.9) + webrick (1.8.1) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-driver (0.7.5-java) @@ -372,7 +385,7 @@ GEM websocket-extensions (0.1.5) with_advisory_lock (4.6.0) activerecord (>= 4.2) - zeitwerk (2.5.4) + zeitwerk (2.6.7) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -382,6 +395,7 @@ PLATFORMS universal-java-11 universal-java-17 universal-java-18 + universal-java-19 x86_64-linux DEPENDENCIES @@ -406,16 +420,16 @@ DEPENDENCIES jdbc-mysql jdbc-sqlite3 (>= 3.7.2) jquery-rails - jruby-jars (= 9.3.4.0) + jruby-jars (= 9.3.9.0) json (>= 1.6.6) mocha omniauth-google-oauth2 omniauth-rails_csrf_protection pry (~> 0.14.0) pry-rails (~> 0.3.9) - puma (>= 5.6.2) + puma (< 7) rack (>= 1.1.0) - rack-attack (~> 4.0) + rack-attack (~> 6.0) rails (~> 6.1.5) rails-controller-testing rake @@ -426,23 +440,22 @@ DEPENDENCIES rubocop-performance rubocop-rails rubocop-rake - rubyzip (~> 1.0) + rubyzip (~> 2) sass - sass-rails (~> 5) - shoulda + sass-rails (~> 6) shoulda-context shoulda-matchers silencer - sucker_punch (~> 2.0) + sucker_punch (~> 3.0) therubyrhino tzinfo-data uglifier (>= 1.0.3) - warbler (~> 2.0) + webrick with_advisory_lock zip-zip RUBY VERSION - ruby 2.6.8p0 (jruby 9.3.4.0) + ruby 2.6.8p0 (jruby 9.3.9.0) BUNDLED WITH - 2.2.32 + 2.2.33 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/stylesheets/editor.sass.erb b/app/assets/stylesheets/editor.sass.erb index 345e2594d..f83578408 100644 --- a/app/assets/stylesheets/editor.sass.erb +++ b/app/assets/stylesheets/editor.sass.erb @@ -1,12 +1,12 @@ // gray + 90: #dadada -$main_color: gray + 90 -$main_color_fade: $main_color + 16 -$main_color_fade_medium: $main_color + 20 -$main_color_fade_full: $main_color + 26 -$main_color_fade_max: $main_color + 37 -$main_color_darken: $main_color - 10 -$main_color_darken_medium: $main_color - 31 -$main_color_darken_full: $main_color - 67 +$main_color: adjust-color(gray, $red: 90, $green: 90, $blue: 90) +$main_color_fade: adjust-color($main_color, $red: 16, $green: 16, $blue: 16) +$main_color_fade_medium: adjust-color($main_color, $red: 20, $green: 20, $blue: 20) +$main_color_fade_full: adjust-color($main_color, $red: 26, $green: 26, $blue: 26) +$main_color_fade_max: adjust-color($main_color, $red: 37, $green: 37, $blue: 37) +$main_color_darken: adjust-color($main_color, $red: -10, $green: -10, $blue: -10) +$main_color_darken_medium: adjust-color($main_color, $red: -31, $green: -31, $blue: -31) +$main_color_darken_full: adjust-color($main_color, $red: -67, $green: -67, $blue: -67) $pn_color: #3C2217 // use a blue-ish color for non-underlined link elements we // want to highlight @@ -51,7 +51,7 @@ $non_underlined_link: #4183c4 background: #c0c0c0 border-style: inset &:disabled - color: $pn_color + 140 + color: adjust-color($pn_color, $red: 140, $green: 140, $blue: 140) #main @@ -75,7 +75,7 @@ $non_underlined_link: #4183c4 //background-color: red .loading - background: gray + 90 + background: adjust-color(gray, $red: 90, $green: 90, $blue: 90) background-image: url("<%= asset_path("ajax_loader.gif") %>") background-repeat: no-repeat background-position: center center diff --git a/app/assets/stylesheets/publication_list.scss.erb b/app/assets/stylesheets/publication_list.scss.erb index 9e32c522a..214911142 100644 --- a/app/assets/stylesheets/publication_list.scss.erb +++ b/app/assets/stylesheets/publication_list.scss.erb @@ -225,7 +225,6 @@ z-index: 20; background-image: url("<%= asset_path("status_back.png") %>"); background-repeat: no-repeat; - #background-color: coral; position: absolute; overflow: hidden; left: 20px; @@ -243,7 +242,6 @@ z-index: 20; background-image: url("<%= asset_path("status_back.png") %>"); background-repeat: no-repeat; - #background-color: coral; position: absolute; overflow: hidden; left: 20px; @@ -261,7 +259,6 @@ z-index: 20; background-image: url("<%= asset_path("status_back.png") %>"); background-repeat: no-repeat; - #background-color: coral; position: absolute; overflow: hidden; left: 20px; @@ -279,7 +276,6 @@ z-index: 20; background-image: url("<%= asset_path("status_back.png") %>"); background-repeat: no-repeat; - #background-color: coral; position: absolute; overflow: hidden; left: 20px; @@ -297,12 +293,10 @@ z-index: 20; background-image: url("<%= asset_path("status_back.png") %>"); background-repeat: no-repeat; - #background-color: coral; position: absolute; overflow: hidden; left: 20px; - background-position: -64px 0px; - #background-position: -48px 0px; } + background-position: -64px 0px; } .identifier_holder_status_approved img { position: absolute; top: 4px; @@ -316,12 +310,10 @@ z-index: 20; background-image: url("<%= asset_path("status_back.png") %>"); background-repeat: no-repeat; - #background-color: coral; position: absolute; overflow: hidden; left: 20px; - background-position: -48px 0px; - #background-position: -32px 0px; } + background-position: -48px 0px; } .identifier_holder_status_committed img { position: absolute; top: 4px; @@ -335,12 +327,10 @@ z-index: 20; background-image: url("<%= asset_path("status_back.png") %>"); background-repeat: no-repeat; - #background-color: coral; position: absolute; overflow: hidden; left: 20px; - background-position: -32px 0px; - #background-position: -16px 0px; } + background-position: -32px 0px; } .identifier_holder_status_archived img { position: absolute; top: 4px; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6d55408df..2484024f6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -108,15 +108,17 @@ def get_user_id end def rpx_setup - if Rails.env.test? && !defined?(Sosol::Application.config.rpx_api_key) && !defined?(Sosol::Application.config.rpx_realm) - @rpx = Rpx::RpxHelper.new('', Sosol::Application.config.rpx_base_url, '') - return true - elsif Sosol::Application.config.rpx_api_key.nil? || Sosol::Application.config.rpx_base_url.nil? || Sosol::Application.config.rpx_realm.nil? - render template: 'const_message' - return false + if Sosol::Application.config.respond_to?(:rpx_api_key) + if Rails.env.test? && !defined?(Sosol::Application.config.rpx_api_key) && !defined?(Sosol::Application.config.rpx_realm) + @rpx = Rpx::RpxHelper.new('', Sosol::Application.config.rpx_base_url, '') + return true + elsif Sosol::Application.config.rpx_api_key.nil? || Sosol::Application.config.rpx_base_url.nil? || Sosol::Application.config.rpx_realm.nil? + render template: 'const_message' + return false + end + @rpx = Rpx::RpxHelper.new(Sosol::Application.config.rpx_api_key, Sosol::Application.config.rpx_base_url, + Sosol::Application.config.rpx_realm) end - @rpx = Rpx::RpxHelper.new(Sosol::Application.config.rpx_api_key, Sosol::Application.config.rpx_base_url, - Sosol::Application.config.rpx_realm) true end diff --git a/app/controllers/dclp_meta_identifiers_controller.rb b/app/controllers/dclp_meta_identifiers_controller.rb index 0c8f75d5c..426782aae 100644 --- a/app/controllers/dclp_meta_identifiers_controller.rb +++ b/app/controllers/dclp_meta_identifiers_controller.rb @@ -193,47 +193,47 @@ def complement_params next unless work[:children] if work[:children][:author] - refList = {} + refList = [] if work[:children][:author][:attributes] && work[:children][:author][:attributes][:ref] && work[:children][:author][:attributes][:ref].is_a?(ActionController::Parameters) - refList = work[:children][:author][:attributes][:ref] + refList << work[:children][:author][:attributes][:ref] end if work[:children][:author][:tlg] && work[:children][:author][:tlg] =~ /\d\d\d\d/ - refList[:tlg] = + refList << "http://data.perseus.org/catalog/urn:cts:greekLit:tlg#{work[:children][:author][:tlg]}" end if work[:children][:author][:phi] && work[:children][:author][:phi] =~ /\d\d\d\d/ - refList[:phi] = + refList << "http://data.perseus.org/catalog/urn:cts:latinLit:phi#{work[:children][:author][:phi]}" end if work[:children][:author][:stoa] && work[:children][:author][:stoa] =~ /\d\d\d\d/ - refList[:stoa] = + refList << "http://catalog.perseus.org/catalog/urn:cts:latinLit:stoa#{work[:children][:author][:stoa]}" end if work[:children][:author][:cwkb] && work[:children][:author][:cwkb] =~ /\d+/ - refList[:cwkb] = "http://cwkb.org/author/id/#{work[:children][:author][:cwkb]}/rdf" + refList << "http://cwkb.org/author/id/#{work[:children][:author][:cwkb]}/rdf" end - work[:children][:author][:attributes][:ref] = refList.invert.invert + work[:children][:author][:attributes][:ref] = refList.uniq.join(' ') end if work[:children][:title] - refList = {} + refList = [] if work[:children][:title][:attributes] && work[:children][:title][:attributes][:ref] && work[:children][:title][:attributes][:ref].is_a?(ActionController::Parameters) - refList = work[:children][:title][:attributes][:ref] + refList << work[:children][:title][:attributes][:ref] end if work[:children][:title][:tm] && work[:children][:title][:tm] =~ /\d+/ - refList[:tm] = "http://www.trismegistos.org/authorwork/#{work[:children][:title][:tm]}" + refList << "http://www.trismegistos.org/authorwork/#{work[:children][:title][:tm]}" end if work[:children][:title][:cwkb] && work[:children][:title][:cwkb] =~ /\d+/ - refList[:cwkb] = "http://cwkb.org/work/id/#{work[:children][:title][:cwkb]}/rdf" + refList << "http://cwkb.org/work/id/#{work[:children][:title][:cwkb]}/rdf" end if work[:children][:title][:stoa] && work[:children][:title][:stoa] =~ /\d+/ && (work[:children][:author] && work[:children][:author][:stoa] && work[:children][:author][:stoa] =~ /\d\d\d\d/) - refList[:stoa] = + refList << "http://catalog.perseus.org/catalog/urn:cts:latinLit:stoa#{work[:children][:author][:stoa]}.stoa#{work[:children][:title][:stoa]}" end if work[:children][:title][:tlg] && work[:children][:title][:tlg] =~ /\d+/ && (work[:children][:author] && work[:children][:author][:tlg] && work[:children][:author][:tlg] =~ /\d\d\d\d/) - refList[:tlg] = + refList << "http://catalog.perseus.org/catalog/urn:cts:greekLit:tlg#{work[:children][:author][:tlg]}.tlg#{work[:children][:title][:tlg]}" end - work[:children][:title][:attributes][:ref] = refList.invert.invert + work[:children][:title][:attributes][:ref] = refList.uniq.join(' ') end next unless work[:children][:extra] @@ -247,6 +247,7 @@ def complement_params end end + Rails.logger.info("DclpMetaIdentifiersController#complement_params: #{params.inspect}") end end end diff --git a/app/models/biblio_identifier.rb b/app/models/biblio_identifier.rb index 1e53e6429..be1cfd577 100644 --- a/app/models/biblio_identifier.rb +++ b/app/models/biblio_identifier.rb @@ -405,6 +405,8 @@ def sortEpiDoc @epiDoc.root.delete element @epiDoc.root.add element end + rescue RuntimeError => e + Rails.logger.error(e.inspect) end end diff --git a/app/models/hgv_meta_identifier.rb b/app/models/hgv_meta_identifier.rb index 307de7964..1dbf18e00 100644 --- a/app/models/hgv_meta_identifier.rb +++ b/app/models/hgv_meta_identifier.rb @@ -398,7 +398,7 @@ def set_epidoc_attributes_tree(parent, xpath, data, config) attribute_value = item[:attributes][attribute_key] attribute_value = if attribute_config[:split].present? && attribute_value.is_a?(Hash) attribute_value.values.join(attribute_config[:split]) - else + elsif attribute_value.is_a?(String) attribute_value.strip end child.attributes[attribute_config[:name]] = attribute_value diff --git a/app/models/publication.rb b/app/models/publication.rb index 0cd30f787..78066275f 100644 --- a/app/models/publication.rb +++ b/app/models/publication.rb @@ -14,7 +14,6 @@ #- determining voting outcome #- commiting to canon -require 'English' require 'English' require 'jgit_tree' require 'shellwords' @@ -198,11 +197,7 @@ def log_info Rails.logger.info "---ID title: #{id.title}" Rails.logger.info "---ID class:#{id.class}" Rails.logger.info '---ID content:' - if id.xml_content - Rails.logger.info id.xml_content - else - Rails.logger.info 'NO CONTENT!' - end + Rails.logger.info id.xml_content || 'NO CONTENT!' # Rails.logger.info "== end Owner: " + publication.owner.name end Rails.logger.info "==end Owner: #{owner.name}" @@ -1702,11 +1697,7 @@ def get_all_comments(title) built_comment.who = (change.attributes['who'] || 'no who attribute') # parse will convert date to local for consistency so work in sort below - built_comment.when = if change.attributes['when'] - Time.zone.parse(change.attributes['when']) - else - Time.zone.parse('1988-8-8') - end + built_comment.when = (Time.zone.parse(change.attributes['when'] || '1988-8-8')) built_comment.why = "From #{ident_title} #{where_from} XML" diff --git a/app/models/repository.rb b/app/models/repository.rb index cc10e0aff..c1dc51f75 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1,6 +1,4 @@ require 'English' -require 'English' -require 'English' require 'fileutils' require 'jgit_tree' require 'shellwords' diff --git a/app/views/layouts/pn.html.erb b/app/views/layouts/pn.html.erb index d9b776631..5c1278207 100644 --- a/app/views/layouts/pn.html.erb +++ b/app/views/layouts/pn.html.erb @@ -44,11 +44,13 @@ e.type = 'text/javascript'; e.id = 'janrainAuthWidget'; - if (document.location.protocol === 'https:') { - e.src = 'https://rpxnow.com/js/lib/<%= Sosol::Application.config.rpx_realm %>/engage.js'; - } else { - e.src = 'http://widget-cdn.rpxnow.com/js/lib/<%= Sosol::Application.config.rpx_realm %>/engage.js'; - } + <% if Sosol::Application.config.respond_to?(:rpx_realm) %> + if (document.location.protocol === 'https:') { + e.src = 'https://rpxnow.com/js/lib/<%= Sosol::Application.config.rpx_realm %>/engage.js'; + } else { + e.src = 'http://widget-cdn.rpxnow.com/js/lib/<%= Sosol::Application.config.rpx_realm %>/engage.js'; + } + <% end %> var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(e, s); diff --git a/config.ru b/config.ru index b0e3d6bb0..82339359c 100644 --- a/config.ru +++ b/config.ru @@ -2,7 +2,7 @@ require_relative 'config/environment' -map ENV['RAILS_RELATIVE_URL_ROOT'] || '/' do +map ENV.fetch('RAILS_RELATIVE_URL_ROOT', '/') do run Rails.application Rails.application.load_server end diff --git a/config/environments/development.rb b/config/environments/development.rb index 206e97c6e..213a31eb8 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -28,7 +28,7 @@ begin require File.join(File.dirname(__FILE__), 'development_secret') rescue LoadError - STDERR.puts('WARNING: config/environments/development_secret.rb missing, no secrets loaded!') + warn('WARNING: config/environments/development_secret.rb missing, no secrets loaded!') end # configure email parameters config.site_email_from = 'admin@localhost' diff --git a/config/environments/production.rb b/config/environments/production.rb index 21f8162be..a14534ac3 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -84,7 +84,7 @@ begin require File.join(File.dirname(__FILE__), 'production_secret') rescue LoadError - STDERR.puts('WARNING: config/environments/production_secret.rb missing, no secrets loaded!') + warn('WARNING: config/environments/production_secret.rb missing, no secrets loaded!') end # configure email parameters config.site_email_from = 'admin@localhost' diff --git a/config/environments/test.rb b/config/environments/test.rb index 4381e6b78..16dcf0227 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -43,7 +43,7 @@ begin require File.join(File.dirname(__FILE__), 'test_secret') rescue LoadError - STDERR.puts('WARNING: config/environments/test_secret.rb missing, no secrets loaded!') + warn('WARNING: config/environments/test_secret.rb missing, no secrets loaded!') end # Configure custom application parameters diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb index 37991c390..025fcdeb4 100644 --- a/config/initializers/airbrake.rb +++ b/config/initializers/airbrake.rb @@ -1,8 +1,8 @@ if defined?(Airbrake) && ENV['AIRBRAKE_HOST'].present? && ENV['AIRBRAKE_PROJECT_KEY'].present? Airbrake.configure do |config| - config.host = ENV['AIRBRAKE_HOST'] + config.host = ENV.fetch('AIRBRAKE_HOST', nil) config.project_id = 1 - config.project_key = ENV['AIRBRAKE_PROJECT_KEY'] + config.project_key = ENV.fetch('AIRBRAKE_PROJECT_KEY', nil) config.environment = Rails.env end end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 978a4e4e5..ba83f67b6 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -310,8 +310,8 @@ # config.sign_in_after_change_password = true if ENV['GOOGLE_CLIENT_ID'].present? && ENV['GOOGLE_CLIENT_SECRET'].present? - config.omniauth :google_oauth2, ENV['GOOGLE_CLIENT_ID'], ENV['GOOGLE_CLIENT_SECRET'], { - redirect_uri: ENV['GOOGLE_REDIRECT_URI'], # e.g. http://localhost:8000/users/auth/google/callback + config.omniauth :google_oauth2, ENV.fetch('GOOGLE_CLIENT_ID', nil), ENV.fetch('GOOGLE_CLIENT_SECRET', nil), { + redirect_uri: ENV.fetch('GOOGLE_REDIRECT_URI', nil), # e.g. http://localhost:8000/users/auth/google/callback name: 'google' } end diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb index a342560fa..9dc7536f6 100644 --- a/config/initializers/rack_attack.rb +++ b/config/initializers/rack_attack.rb @@ -3,17 +3,17 @@ module Rack class Attack # Always allow requests from localhost - # (blacklist & throttles are skipped) + # (blocklist & throttles are skipped) # This is helpful if Tomcat isn't correctly picking up the real IP address # from Apache ProxyPass proxying. See discussion at: https://github.com/sosol/sosol/issues/234 - Rack::Attack.whitelist('allow from localhost') do |req| + Rack::Attack.safelist('allow from localhost') do |req| # Requests are allowed if the return value is truthy req.ip == '127.0.0.1' || req.ip == '::1' || req.ip == '0:0:0:0:0:0:0:1' end # Block suspicious requests for '/etc/password' or wordpress specific paths. # After 1 blocked request in 10 minutes, block all requests from that IP for 60 minutes. - Rack::Attack.blacklist('fail2ban pentesters') do |req| + Rack::Attack.blocklist('fail2ban pentesters') do |req| # `filter` returns truthy value if request fails, or if it's from a previously banned IP # so the request is blocked Rack::Attack::Fail2Ban.filter("pentesters-#{req.ip}", maxretry: 1, findtime: 10.minutes, diff --git a/config/warble.rb b/config/warble.rb deleted file mode 100644 index e17294f4f..000000000 --- a/config/warble.rb +++ /dev/null @@ -1,100 +0,0 @@ -# Disable automatic framework detection by uncommenting/setting to false -# Warbler.framework_detection = false - -# require 'sass/plugin' - -# Warbler web application assembly configuration file -Warbler::Config.new do |config| - # Update stylesheets before doing anything - # Sass::Plugin.update_stylesheets - - # Temporary directory where the application is staged - # config.staging_dir = "tmp/war" - - # Application directories to be included in the webapp. - config.dirs = %w[app config data lib log vendor tmp lib/rxsugar data/xslt/epidoc data/xslt/pn/navigator] - - # Additional files/directories to include, above those in config.dirs - config.includes = FileList['.ruby-version'] - # config.includes = FileList["db"] - # config.includes = FileList[ - # "db/production.sqlite3", - # "vendor/gems/*/.specification"] - - # Additional files/directories to exclude - # config.excludes = FileList["lib/tasks/*"] - - # Additional Java .jar files to include. Note that if .jar files are placed - # in lib (and not otherwise excluded) then they need not be mentioned here. - # JRuby and JRuby-Rack are pre-loaded in this list. Be sure to include your - # own versions if you directly set the value - config.java_libs += FileList['lib/java/*.jar'] - - # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes. - # config.java_classes = FileList["target/classes/**.*"] - - # One or more pathmaps defining how the java classes should be copied into - # WEB-INF/classes. The example pathmap below accompanies the java_classes - # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017 - # for details of how to specify a pathmap. - # config.pathmaps.java_classes << "%{target/classes/,}p" - - # Gems to be included. You need to tell Warbler which gems your application needs - # so that they can be packaged in the war file. - # The Rails gems are included by default unless the vendor/rails directory is present. - # config.gems += ["activerecord-jdbcmysql-adapter", "jruby-openssl"] - # config.gems << "tzinfo" - - # Uncomment this if you don't want to package rails gem. - # config.gems -= ["rails"] - - # The most recent versions of gems are used. - # You can specify versions of gems by using a hash assignment: - # config.gems["rails"] = "2.0.2" - - # You can also use regexps or Gem::Dependency objects for flexibility or - # fine-grained control. - # config.gems << /^merb-/ - # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3") - - # config.gems << "jruby-openssl" - - # Include gem dependencies not mentioned specifically - # config.gem_dependencies = true - - # Files to be included in the root of the webapp. Note that files in public - # will have the leading 'public/' part of the path stripped during staging. - config.public_html = FileList['public/**/*'] # , "doc/**/*"] - - # Pathmaps for controlling how public HTML files are copied into the .war - config.pathmaps.public_html = ['%{public/,}p'] - - # Name of the war file (without the .war) -- defaults to the basename - # of RAILS_ROOT - # config.war_name = "mywar" - - # Name of the MANIFEST.MF template for the war file. Defaults to the - # MANIFEST.MF normally generated by `jar cf`. - # config.manifest_file = "config/MANIFEST.MF" - - # Value of RAILS_ENV for the webapp -- default as shown below - # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production' - - # Application booter to use, one of :rack, :rails, or :merb. (Default :rails) - # config.webxml.booter = :rails - - # When using the :rack booter, "Rackup" script to use. - # The script is evaluated in a Rack::Builder to load the application. - # Examples: - # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)} - # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru")) - - # Control the pool of Rails runtimes. Leaving unspecified means - # the pool will grow as needed to service requests. It is recommended - # that you fix these values when running a production server! - config.webxml.jruby.min.runtimes = 2 - config.webxml.jruby.max.runtimes = 4 - - # JNDI data source name - # config.webxml.jndi = 'jdbc/rails' -end diff --git a/data/templates/hgv_trans_identifier.xml.erb b/data/templates/hgv_trans_identifier.xml.erb index 8eb0785b6..d623d0da4 100644 --- a/data/templates/hgv_trans_identifier.xml.erb +++ b/data/templates/hgv_trans_identifier.xml.erb @@ -23,14 +23,14 @@ - Französisch - Englisch - Deutsch - Italienisch - Spanisch - Latein - Griechisch - Arabisch + French + English + German + Italian + Spanish + Latin + Modern Greek + Arabic diff --git a/lib/rpx.rb b/lib/rpx.rb index d10ce0474..c0e44d7fe 100644 --- a/lib/rpx.rb +++ b/lib/rpx.rb @@ -1,5 +1,4 @@ require 'English' -require 'English' require 'uri' require 'net/http' require 'net/https' diff --git a/lib/tasks/documentation.rake b/lib/tasks/documentation.rake index 9ec77dac8..96a9633b4 100644 --- a/lib/tasks/documentation.rake +++ b/lib/tasks/documentation.rake @@ -13,7 +13,7 @@ namespace :doc do RDoc::Task.new('app') do |rdoc| rdoc.rdoc_dir = 'doc/app' rdoc.template = ENV['template'] if ENV['template'] - rdoc.title = ENV['title'] || 'Rails Application Documentation' + rdoc.title = ENV.fetch('title', 'Rails Application Documentation') rdoc.options << '--line-numbers' << '--inline-source' rdoc.options << '--charset' << 'utf-8' rdoc.rdoc_files.include('README.rdoc') diff --git a/lib/tasks/dump_fixtures.rake b/lib/tasks/dump_fixtures.rake index 68d7e2153..317d08d03 100644 --- a/lib/tasks/dump_fixtures.rake +++ b/lib/tasks/dump_fixtures.rake @@ -3,8 +3,8 @@ and DEST to specify the target database and destination path for the fixtures. DB defaults to development and DEST defaults to RAILS_ROOT/ test/fixtures.' task dump_fixtures: :environment do - path = ENV['DEST'] || "#{RAILS_ROOT}/test/fixtures" - db = ENV['DB'] || 'development' + path = ENV.fetch('DEST') { "#{RAILS_ROOT}/test/fixtures" } + db = ENV.fetch('DB', 'development') sql = 'SELECT * FROM %s' ActiveRecord::Base.establish_connection(db) diff --git a/test/integration/apis_workflow_test.rb b/test/integration/apis_workflow_test.rb index 34c6844c4..ee6aae709 100644 --- a/test/integration/apis_workflow_test.rb +++ b/test/integration/apis_workflow_test.rb @@ -209,7 +209,7 @@ class ApisWorkflowTest < ActionDispatch::IntegrationTest Rails.logger.debug { "--APIS flash is: #{edit_session.flash.inspect}" } apis_identifier.reload - assert apis_identifier.modified?, 'APIS Identifier should be modified after we edit it' + assert_predicate apis_identifier, :modified?, 'APIS Identifier should be modified after we edit it' end open_session do |submit_session| diff --git a/test/integration/community_workflow_test.rb b/test/integration/community_workflow_test.rb index 7a4e04404..fa31006aa 100644 --- a/test/integration/community_workflow_test.rb +++ b/test/integration/community_workflow_test.rb @@ -77,11 +77,7 @@ def output_publication_info(publication) Rails.logger.info "---ID title: #{id.title}" Rails.logger.info "---ID class:#{id.class}" Rails.logger.info '---ID content:' - if id.xml_content - Rails.logger.info id.xml_content - else - Rails.logger.info 'NO CONTENT!' - end + Rails.logger.info id.xml_content || 'NO CONTENT!' # Rails.logger.info "== end Owner: " + publication.owner.name end Rails.logger.info "==end Owner: #{publication.owner.name}" diff --git a/test/integration/sosol_workflow_test.rb b/test/integration/sosol_workflow_test.rb index 0e8dacee1..84400c8d6 100644 --- a/test/integration/sosol_workflow_test.rb +++ b/test/integration/sosol_workflow_test.rb @@ -289,7 +289,8 @@ class SosolWorkflowTest < ActionDispatch::IntegrationTest end assert meta_final_identifier.content, "finalizing publication's identifier should have content" - assert meta_final_publication.needs_rename?, 'finalizing publication should need rename before being renamed' + assert_predicate meta_final_publication, :needs_rename?, + 'finalizing publication should need rename before being renamed' Rails.logger.info('meta_final_identifier') Rails.logger.info(meta_final_identifier.inspect) @@ -404,7 +405,8 @@ class SosolWorkflowTest < ActionDispatch::IntegrationTest end assert_not_nil text_final_identifier, 'Finalizer does not have controlled identifier' - assert text_final_publication.needs_rename?, 'finalizing publication should need rename before being renamed' + assert_predicate text_final_publication, :needs_rename?, + 'finalizing publication should need rename before being renamed' # try to finalize without rename open_session do |text_finalize_session| diff --git a/test/test_helper.rb b/test/test_helper.rb index 9ab081edc..2145ba7ee 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,8 +4,8 @@ require 'rails/test_help' require 'factory_bot_rails' require 'factory_bot' -require 'shoulda' require 'shoulda/matchers' +require 'shoulda/context' require 'active_support' require 'active_support/test_case' require 'database_cleaner/active_record' @@ -80,7 +80,7 @@ def setup_flock end def teardown_flock - FileUtils.remove_entry_secure ENV['FLOCK_DIR'] + FileUtils.remove_entry_secure ENV.fetch('FLOCK_DIR', nil) end setup :setup_test_repository diff --git a/test/unit/date_test.rb b/test/unit/date_test.rb index 0c58d1ae6..365aacdbc 100644 --- a/test/unit/date_test.rb +++ b/test/unit/date_test.rb @@ -709,18 +709,6 @@ def test_get_chron_simple chron: :chronMin }, '0400' => { c: '4', y: '', m: '', d: '', cq: '', yq: '', mq: '', chron: :chronMax }, - '-1976' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - '1976' => { c: '', y: '1976', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - '-1976-07' => { c: '', y: '-1976', m: 7, d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - '1976-08' => { c: '', y: '1976', m: 8, d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - '-1976-07-06' => { c: '', y: '-1976', m: 7, d: '6', cq: '', yq: '', mq: '', - chron: :chronMin }, - '1976-08-07' => { c: '', y: '1976', m: 8, d: '7', cq: '', yq: '', mq: '', - chron: :chronMax }, '-0175' => { c: '-2', y: '', m: '', d: '', cq: 'middle', yq: '', mq: '', chron: :chronMin }, @@ -730,22 +718,7 @@ def test_get_chron_simple chron: :chronMin }, '0350' => { c: '4', y: '', m: '', d: '', cq: 'first_half', yq: '', mq: '', chron: :chronMax }, - '-1976' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'beginning', mq: '', - chron: :chronMin }, - '1976' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'middle', mq: '', - chron: :chronMax }, - '-1976-07' => { c: '', y: '-1976', m: 7, d: '', cq: '', yq: '', mq: 'middle', - chron: :chronMin }, - '1976-08' => { c: '', y: '1976', m: 8, d: '', cq: '', yq: '', mq: 'end', - chron: :chronMax }, - - '' => { c: '-2', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chron }, - '' => { c: '-1', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chron }, - '' => { c: '3', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chron }, - '' => { c: '4', y: '', m: '', d: '', cq: '', yq: '', mq: '', + '' => { c: '4', y: '', m: '', d: '', cq: '', yq: '', mq: '', chron: :chron }, '-1976' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: '', mq: '', @@ -765,33 +738,6 @@ def test_get_chron_simple def test_century_qualifier chronFunction({ - '-0500-01-01' => { c: '-5', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - '-0100-01-01' => { c: '-1', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - '0001-01-01' => { c: '1', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - '0401-01-01' => { c: '5', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - - '-0401-12-31' => { c: '-5', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - '-0001-12-31' => { c: '-1', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - '0100-12-31' => { c: '1', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - '0500-12-31' => { c: '5', y: '', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - - '-0500-01-01' => { c: '-5', y: '', m: '', d: '', cq: 'beginning', yq: '', mq: '', - chron: :chronMin }, - '-0100-01-01' => { c: '-1', y: '', m: '', d: '', cq: 'beginning', yq: '', mq: '', - chron: :chronMin }, - '0001-01-01' => { c: '1', y: '', m: '', d: '', cq: 'beginning', yq: '', mq: '', - chron: :chronMin }, - '0401-01-01' => { c: '5', y: '', m: '', d: '', cq: 'beginning', yq: '', mq: '', - chron: :chronMin }, - '-0476-12-31' => { c: '-5', y: '', m: '', d: '', cq: 'beginning', yq: '', mq: '', chron: :chronMax }, '-0076-12-31' => { c: '-1', y: '', m: '', d: '', cq: 'beginning', yq: '', mq: '', @@ -810,24 +756,6 @@ def test_century_qualifier '0401-01-01' => { c: '5', y: '', m: '', d: '', cq: 'first_half', yq: '', mq: '', chron: :chronMin }, - '-0451-12-31' => { c: '-5', y: '', m: '', d: '', cq: 'first_half', yq: '', mq: '', - chron: :chronMax }, - '-0051-12-31' => { c: '-1', y: '', m: '', d: '', cq: 'first_half', yq: '', mq: '', - chron: :chronMax }, - '0050-12-31' => { c: '1', y: '', m: '', d: '', cq: 'first_half', yq: '', mq: '', - chron: :chronMax }, - '0450-12-31' => { c: '5', y: '', m: '', d: '', cq: 'first_half', yq: '', mq: '', - chron: :chronMax }, - - '-0475-01-01' => { c: '-5', y: '', m: '', d: '', cq: 'first_half_to_middle', yq: '', mq: '', - chron: :chronMin }, - '-0075-01-01' => { c: '-1', y: '', m: '', d: '', cq: 'first_half_to_middle', yq: '', mq: '', - chron: :chronMin }, - '0026-01-01' => { c: '1', y: '', m: '', d: '', cq: 'first_half_to_middle', yq: '', mq: '', - chron: :chronMin }, - '0426-01-01' => { c: '5', y: '', m: '', d: '', cq: 'first_half_to_middle', yq: '', mq: '', - chron: :chronMin }, - '-0451-12-31' => { c: '-5', y: '', m: '', d: '', cq: 'first_half_to_middle', yq: '', mq: '', chron: :chronMax }, '-0051-12-31' => { c: '-1', y: '', m: '', d: '', cq: 'first_half_to_middle', yq: '', mq: '', @@ -846,24 +774,6 @@ def test_century_qualifier '0426-01-01' => { c: '5', y: '', m: '', d: '', cq: 'middle', yq: '', mq: '', chron: :chronMin }, - '-0426-12-31' => { c: '-5', y: '', m: '', d: '', cq: 'middle', yq: '', mq: '', - chron: :chronMax }, - '-0026-12-31' => { c: '-1', y: '', m: '', d: '', cq: 'middle', yq: '', mq: '', - chron: :chronMax }, - '0075-12-31' => { c: '1', y: '', m: '', d: '', cq: 'middle', yq: '', mq: '', - chron: :chronMax }, - '0475-12-31' => { c: '5', y: '', m: '', d: '', cq: 'middle', yq: '', mq: '', - chron: :chronMax }, - - '-0450-01-01' => { c: '-5', y: '', m: '', d: '', cq: 'middle_to_second_half', yq: '', mq: '', - chron: :chronMin }, - '-0050-01-01' => { c: '-1', y: '', m: '', d: '', cq: 'middle_to_second_half', yq: '', mq: '', - chron: :chronMin }, - '0051-01-01' => { c: '1', y: '', m: '', d: '', cq: 'middle_to_second_half', yq: '', mq: '', - chron: :chronMin }, - '0451-01-01' => { c: '5', y: '', m: '', d: '', cq: 'middle_to_second_half', yq: '', mq: '', - chron: :chronMin }, - '-0426-12-31' => { c: '-5', y: '', m: '', d: '', cq: 'middle_to_second_half', yq: '', mq: '', chron: :chronMax }, '-0026-12-31' => { c: '-1', y: '', m: '', d: '', cq: 'middle_to_second_half', yq: '', mq: '', @@ -882,15 +792,6 @@ def test_century_qualifier '0451-01-01' => { c: '5', y: '', m: '', d: '', cq: 'second_half', yq: '', mq: '', chron: :chronMin }, - '-0401-12-31' => { c: '-5', y: '', m: '', d: '', cq: 'second_half', yq: '', mq: '', - chron: :chronMax }, - '-0001-12-31' => { c: '-1', y: '', m: '', d: '', cq: 'second_half', yq: '', mq: '', - chron: :chronMax }, - '0100-12-31' => { c: '1', y: '', m: '', d: '', cq: 'second_half', yq: '', mq: '', - chron: :chronMax }, - '0500-12-31' => { c: '5', y: '', m: '', d: '', cq: 'second_half', yq: '', mq: '', - chron: :chronMax }, - '-0425-01-01' => { c: '-5', y: '', m: '', d: '', cq: 'end', yq: '', mq: '', chron: :chronMin }, '-0025-01-01' => { c: '-1', y: '', m: '', d: '', cq: 'end', yq: '', mq: '', @@ -913,33 +814,6 @@ def test_century_qualifier def test_year_qualifier chronFunction({ - '0001-01-01' => { c: '', y: '1', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - '1976-01-01' => { c: '', y: '1976', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - '-0001-01-01' => { c: '', y: '-1', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - '-1976-01-01' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMin }, - - '0001-12-31' => { c: '', y: '1', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - '1976-12-31' => { c: '', y: '1976', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - '-0001-12-31' => { c: '', y: '-1', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - '-1976-12-31' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: '', mq: '', - chron: :chronMax }, - - '0001-01-01' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'beginning', mq: '', - chron: :chronMin }, - '1976-01-01' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'beginning', mq: '', - chron: :chronMin }, - '-0001-01-01' => { c: '', y: '-1', m: '', d: '', cq: '', yq: 'beginning', mq: '', - chron: :chronMin }, - '-1976-01-01' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'beginning', mq: '', - chron: :chronMin }, - '0001-03-31' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'beginning', mq: '', chron: :chronMax }, '1976-03-31' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'beginning', mq: '', @@ -958,30 +832,10 @@ def test_year_qualifier '-1976-01-01' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'first_half', mq: '', chron: :chronMin }, - '0001-06-30' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'first_half', mq: '', - chron: :chronMax }, - '1976-06-30' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'first_half', mq: '', - chron: :chronMax }, - '-0001-06-30' => { c: '', y: '-1', m: '', d: '', cq: '', yq: 'first_half', mq: '', - chron: :chronMax }, - '-1976-06-30' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'first_half', mq: '', - chron: :chronMax }, - - '0001-04-01' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'first_half_to_middle', - mq: '', chron: :chronMin }, - '1976-04-01' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'first_half_to_middle', - mq: '', chron: :chronMin }, - '-0001-04-01' => { c: '', y: '-1', m: '', d: '', cq: '', yq: 'first_half_to_middle', - mq: '', chron: :chronMin }, - '-1976-04-01' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'first_half_to_middle', - mq: '', chron: :chronMin }, - '0001-06-30' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'first_half_to_middle', mq: '', chron: :chronMax }, '1976-06-30' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'first_half_to_middle', mq: '', chron: :chronMax }, - '-0001-06-30' => { c: '', y: '-1', m: '', d: '', cq: '', yq: 'first_half_to_middle', - mq: '', chron: :chronMax }, '-1976-06-30' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'first_half_to_middle', mq: '', chron: :chronMax }, @@ -994,24 +848,6 @@ def test_year_qualifier '-1976-04-01' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'middle', mq: '', chron: :chronMin }, - '0001-09-30' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'middle', mq: '', - chron: :chronMax }, - '1976-09-30' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'middle', mq: '', - chron: :chronMax }, - '-0001-09-30' => { c: '', y: '-1', m: '', d: '', cq: '', yq: 'middle', mq: '', - chron: :chronMax }, - '-1976-09-30' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'middle', mq: '', - chron: :chronMax }, - - '0001-07-01' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'middle_to_second_half', - mq: '', chron: :chronMin }, - '1976-07-01' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'middle_to_second_half', - mq: '', chron: :chronMin }, - '-0001-07-01' => { c: '', y: '-1', m: '', d: '', cq: '', yq: 'middle_to_second_half', - mq: '', chron: :chronMin }, - '-1976-07-01' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'middle_to_second_half', - mq: '', chron: :chronMin }, - '0001-09-30' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'middle_to_second_half', mq: '', chron: :chronMax }, '1976-09-30' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'middle_to_second_half', @@ -1030,15 +866,6 @@ def test_year_qualifier '-1976-07-01' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'second_half', mq: '', chron: :chronMin }, - '0001-12-31' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'second_half', mq: '', - chron: :chronMax }, - '1976-12-31' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'second_half', mq: '', - chron: :chronMax }, - '-0001-12-31' => { c: '', y: '-1', m: '', d: '', cq: '', yq: 'second_half', mq: '', - chron: :chronMax }, - '-1976-12-31' => { c: '', y: '-1976', m: '', d: '', cq: '', yq: 'second_half', mq: '', - chron: :chronMax }, - '0001-10-01' => { c: '', y: '1', m: '', d: '', cq: '', yq: 'end', mq: '', chron: :chronMin }, '1976-10-01' => { c: '', y: '1976', m: '', d: '', cq: '', yq: 'end', mq: '', @@ -1147,24 +974,10 @@ def test_leap_year def test_miscellaneous chronFunction({ - '0543-02-01' => { c: '6', y: '543', m: '2', d: '1', cq: '', yq: '', mq: '', - chron: :chronMin }, - '0543-02-01' => { c: '6', y: '543', m: '2', d: '1', cq: '', yq: '', mq: '', - chron: :chronMax }, - '-0543-02-01' => { c: '-6', y: '-543', m: '2', d: '1', cq: '', yq: '', mq: '', - chron: :chronMin }, - '-0543-02-01' => { c: '-6', y: '-543', m: '2', d: '1', cq: '', yq: '', mq: '', - chron: :chronMax }, - '0543-02-01' => { c: '6', y: '543', m: '2', d: '1', cq: 'middle', yq: 'beginning', - mq: 'beginning', chron: :chronMin }, '0543-02-01' => { c: '6', y: '543', m: '2', d: '1', cq: 'middle', yq: 'beginning', mq: 'beginning', chron: :chronMax }, - '-0543-02-01' => { c: '-6', y: '-543', m: '2', d: '1', cq: 'middle', yq: 'beginning', - mq: 'beginning', chron: :chronMin }, '-0543-02-01' => { c: '-6', y: '-543', m: '2', d: '1', cq: 'middle', yq: 'beginning', mq: 'beginning', chron: :chronMax }, - '-0257-02-29' => { c: '', y: '-257', m: '2', d: '29', cq: '', yq: '', mq: '', - chron: :chronMin }, '-0257-02-29' => { c: '', y: '-257', m: '2', d: '29', cq: '', yq: '', mq: '', chron: :chronMax } }) diff --git a/test/unit/decree_test.rb b/test/unit/decree_test.rb index 593b32160..09c3ad0c0 100644 --- a/test/unit/decree_test.rb +++ b/test/unit/decree_test.rb @@ -27,7 +27,7 @@ class DecreeTest < ActiveSupport::TestCase end should 'have choices' do - assert @decree.get_choice_array.length.positive? + assert_predicate @decree.get_choice_array.length, :positive? end context 'with votes on a publication/identifier' do diff --git a/test/unit/publication_test.rb b/test/unit/publication_test.rb index feed87f61..907a55426 100644 --- a/test/unit/publication_test.rb +++ b/test/unit/publication_test.rb @@ -89,7 +89,7 @@ class PublicationTest < ActiveSupport::TestCase should 'have valid XML for templates' do @publication.identifiers.each do |identifier| - assert identifier.is_valid_xml? + assert_predicate identifier, :is_valid_xml? end end diff --git a/vendor/cache/actioncable-6.1.5.1.gem b/vendor/cache/actioncable-6.1.5.1.gem deleted file mode 100644 index 778bc291b..000000000 Binary files a/vendor/cache/actioncable-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/actioncable-6.1.7.3.gem b/vendor/cache/actioncable-6.1.7.3.gem new file mode 100644 index 000000000..424aea110 Binary files /dev/null and b/vendor/cache/actioncable-6.1.7.3.gem differ diff --git a/vendor/cache/actionmailbox-6.1.5.1.gem b/vendor/cache/actionmailbox-6.1.5.1.gem deleted file mode 100644 index e5a2076ef..000000000 Binary files a/vendor/cache/actionmailbox-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/actionmailbox-6.1.7.3.gem b/vendor/cache/actionmailbox-6.1.7.3.gem new file mode 100644 index 000000000..09e5839a0 Binary files /dev/null and b/vendor/cache/actionmailbox-6.1.7.3.gem differ diff --git a/vendor/cache/actionmailer-6.1.5.1.gem b/vendor/cache/actionmailer-6.1.5.1.gem deleted file mode 100644 index 280762bbd..000000000 Binary files a/vendor/cache/actionmailer-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-6.1.7.3.gem b/vendor/cache/actionmailer-6.1.7.3.gem new file mode 100644 index 000000000..d06e55f6b Binary files /dev/null and b/vendor/cache/actionmailer-6.1.7.3.gem differ diff --git a/vendor/cache/actionpack-6.1.5.1.gem b/vendor/cache/actionpack-6.1.5.1.gem deleted file mode 100644 index ebda9f755..000000000 Binary files a/vendor/cache/actionpack-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/actionpack-6.1.7.3.gem b/vendor/cache/actionpack-6.1.7.3.gem new file mode 100644 index 000000000..8d9aefae0 Binary files /dev/null and b/vendor/cache/actionpack-6.1.7.3.gem differ diff --git a/vendor/cache/actiontext-6.1.5.1.gem b/vendor/cache/actiontext-6.1.5.1.gem deleted file mode 100644 index 508a2df44..000000000 Binary files a/vendor/cache/actiontext-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/actiontext-6.1.7.3.gem b/vendor/cache/actiontext-6.1.7.3.gem new file mode 100644 index 000000000..3ba623fda Binary files /dev/null and b/vendor/cache/actiontext-6.1.7.3.gem differ diff --git a/vendor/cache/actionview-6.1.5.1.gem b/vendor/cache/actionview-6.1.5.1.gem deleted file mode 100644 index 53b941722..000000000 Binary files a/vendor/cache/actionview-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/actionview-6.1.7.3.gem b/vendor/cache/actionview-6.1.7.3.gem new file mode 100644 index 000000000..b3304bb07 Binary files /dev/null and b/vendor/cache/actionview-6.1.7.3.gem differ diff --git a/vendor/cache/activejob-6.1.5.1.gem b/vendor/cache/activejob-6.1.5.1.gem deleted file mode 100644 index 819ad89ef..000000000 Binary files a/vendor/cache/activejob-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/activejob-6.1.7.3.gem b/vendor/cache/activejob-6.1.7.3.gem new file mode 100644 index 000000000..c15b66a8c Binary files /dev/null and b/vendor/cache/activejob-6.1.7.3.gem differ diff --git a/vendor/cache/activemodel-6.1.5.1.gem b/vendor/cache/activemodel-6.1.5.1.gem deleted file mode 100644 index 93591fe86..000000000 Binary files a/vendor/cache/activemodel-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/activemodel-6.1.7.3.gem b/vendor/cache/activemodel-6.1.7.3.gem new file mode 100644 index 000000000..f1060dd05 Binary files /dev/null and b/vendor/cache/activemodel-6.1.7.3.gem differ diff --git a/vendor/cache/activerecord-6.1.5.1.gem b/vendor/cache/activerecord-6.1.5.1.gem deleted file mode 100644 index bce44c165..000000000 Binary files a/vendor/cache/activerecord-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/activerecord-6.1.7.3.gem b/vendor/cache/activerecord-6.1.7.3.gem new file mode 100644 index 000000000..ee728b03e Binary files /dev/null and b/vendor/cache/activerecord-6.1.7.3.gem differ diff --git a/vendor/cache/activerecord-jdbc-adapter-61.1-java.gem b/vendor/cache/activerecord-jdbc-adapter-61.1-java.gem deleted file mode 100644 index 7546549eb..000000000 Binary files a/vendor/cache/activerecord-jdbc-adapter-61.1-java.gem and /dev/null differ diff --git a/vendor/cache/activerecord-jdbc-adapter-61.2-java.gem b/vendor/cache/activerecord-jdbc-adapter-61.2-java.gem new file mode 100644 index 000000000..ea80f9986 Binary files /dev/null and b/vendor/cache/activerecord-jdbc-adapter-61.2-java.gem differ diff --git a/vendor/cache/activerecord-jdbcmysql-adapter-61.1-java.gem b/vendor/cache/activerecord-jdbcmysql-adapter-61.1-java.gem deleted file mode 100644 index 11342aadf..000000000 Binary files a/vendor/cache/activerecord-jdbcmysql-adapter-61.1-java.gem and /dev/null differ diff --git a/vendor/cache/activerecord-jdbcmysql-adapter-61.2-java.gem b/vendor/cache/activerecord-jdbcmysql-adapter-61.2-java.gem new file mode 100644 index 000000000..49bc83e77 Binary files /dev/null and b/vendor/cache/activerecord-jdbcmysql-adapter-61.2-java.gem differ diff --git a/vendor/cache/activerecord-jdbcpostgresql-adapter-61.1-java.gem b/vendor/cache/activerecord-jdbcpostgresql-adapter-61.1-java.gem deleted file mode 100644 index 9fa2a93db..000000000 Binary files a/vendor/cache/activerecord-jdbcpostgresql-adapter-61.1-java.gem and /dev/null differ diff --git a/vendor/cache/activerecord-jdbcpostgresql-adapter-61.2-java.gem b/vendor/cache/activerecord-jdbcpostgresql-adapter-61.2-java.gem new file mode 100644 index 000000000..6c65a1492 Binary files /dev/null and b/vendor/cache/activerecord-jdbcpostgresql-adapter-61.2-java.gem differ diff --git a/vendor/cache/activerecord-jdbcsqlite3-adapter-61.1-java.gem b/vendor/cache/activerecord-jdbcsqlite3-adapter-61.1-java.gem deleted file mode 100644 index 3be656809..000000000 Binary files a/vendor/cache/activerecord-jdbcsqlite3-adapter-61.1-java.gem and /dev/null differ diff --git a/vendor/cache/activerecord-jdbcsqlite3-adapter-61.2-java.gem b/vendor/cache/activerecord-jdbcsqlite3-adapter-61.2-java.gem new file mode 100644 index 000000000..9ceb02c76 Binary files /dev/null and b/vendor/cache/activerecord-jdbcsqlite3-adapter-61.2-java.gem differ diff --git a/vendor/cache/activestorage-6.1.5.1.gem b/vendor/cache/activestorage-6.1.5.1.gem deleted file mode 100644 index 5de0a9822..000000000 Binary files a/vendor/cache/activestorage-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/activestorage-6.1.7.3.gem b/vendor/cache/activestorage-6.1.7.3.gem new file mode 100644 index 000000000..59bbfc3bc Binary files /dev/null and b/vendor/cache/activestorage-6.1.7.3.gem differ diff --git a/vendor/cache/activesupport-6.1.5.1.gem b/vendor/cache/activesupport-6.1.5.1.gem deleted file mode 100644 index cbebd1f4b..000000000 Binary files a/vendor/cache/activesupport-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/activesupport-6.1.7.3.gem b/vendor/cache/activesupport-6.1.7.3.gem new file mode 100644 index 000000000..41fb50971 Binary files /dev/null and b/vendor/cache/activesupport-6.1.7.3.gem differ diff --git a/vendor/cache/airbrake-13.0.0.gem b/vendor/cache/airbrake-13.0.0.gem deleted file mode 100644 index cf3095c58..000000000 Binary files a/vendor/cache/airbrake-13.0.0.gem and /dev/null differ diff --git a/vendor/cache/airbrake-13.0.3.gem b/vendor/cache/airbrake-13.0.3.gem new file mode 100644 index 000000000..7dbe7b5b8 Binary files /dev/null and b/vendor/cache/airbrake-13.0.3.gem differ diff --git a/vendor/cache/airbrake-ruby-6.1.0-java.gem b/vendor/cache/airbrake-ruby-6.1.0-java.gem deleted file mode 100644 index 697d62b6b..000000000 Binary files a/vendor/cache/airbrake-ruby-6.1.0-java.gem and /dev/null differ diff --git a/vendor/cache/airbrake-ruby-6.2.0-java.gem b/vendor/cache/airbrake-ruby-6.2.0-java.gem new file mode 100644 index 000000000..0d5a57d86 Binary files /dev/null and b/vendor/cache/airbrake-ruby-6.2.0-java.gem differ diff --git a/vendor/cache/bcrypt-3.1.17-java.gem b/vendor/cache/bcrypt-3.1.17-java.gem deleted file mode 100644 index 5782e74b2..000000000 Binary files a/vendor/cache/bcrypt-3.1.17-java.gem and /dev/null differ diff --git a/vendor/cache/bcrypt-3.1.18-java.gem b/vendor/cache/bcrypt-3.1.18-java.gem new file mode 100644 index 000000000..58112ae6d Binary files /dev/null and b/vendor/cache/bcrypt-3.1.18-java.gem differ diff --git a/vendor/cache/concurrent-ruby-1.1.10.gem b/vendor/cache/concurrent-ruby-1.1.10.gem deleted file mode 100644 index c796701be..000000000 Binary files a/vendor/cache/concurrent-ruby-1.1.10.gem and /dev/null differ diff --git a/vendor/cache/concurrent-ruby-1.2.2.gem b/vendor/cache/concurrent-ruby-1.2.2.gem new file mode 100644 index 000000000..8caccaff9 Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.2.2.gem differ diff --git a/vendor/cache/database_cleaner-active_record-2.0.1.gem b/vendor/cache/database_cleaner-active_record-2.0.1.gem deleted file mode 100644 index c1ed4b402..000000000 Binary files a/vendor/cache/database_cleaner-active_record-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/database_cleaner-active_record-2.1.0.gem b/vendor/cache/database_cleaner-active_record-2.1.0.gem new file mode 100644 index 000000000..3557f63b6 Binary files /dev/null and b/vendor/cache/database_cleaner-active_record-2.1.0.gem differ diff --git a/vendor/cache/date-3.3.3-java.gem b/vendor/cache/date-3.3.3-java.gem new file mode 100644 index 000000000..21ebbb927 Binary files /dev/null and b/vendor/cache/date-3.3.3-java.gem differ diff --git a/vendor/cache/devise-4.8.1.gem b/vendor/cache/devise-4.8.1.gem deleted file mode 100644 index 36cd4b921..000000000 Binary files a/vendor/cache/devise-4.8.1.gem and /dev/null differ diff --git a/vendor/cache/devise-4.9.0.gem b/vendor/cache/devise-4.9.0.gem new file mode 100644 index 000000000..192e0dfd8 Binary files /dev/null and b/vendor/cache/devise-4.9.0.gem differ diff --git a/vendor/cache/dotenv-2.7.6.gem b/vendor/cache/dotenv-2.7.6.gem deleted file mode 100644 index c3a414727..000000000 Binary files a/vendor/cache/dotenv-2.7.6.gem and /dev/null differ diff --git a/vendor/cache/dotenv-2.8.1.gem b/vendor/cache/dotenv-2.8.1.gem new file mode 100644 index 000000000..1e9520717 Binary files /dev/null and b/vendor/cache/dotenv-2.8.1.gem differ diff --git a/vendor/cache/dotenv-rails-2.7.6.gem b/vendor/cache/dotenv-rails-2.7.6.gem deleted file mode 100644 index 8f292af2b..000000000 Binary files a/vendor/cache/dotenv-rails-2.7.6.gem and /dev/null differ diff --git a/vendor/cache/dotenv-rails-2.8.1.gem b/vendor/cache/dotenv-rails-2.8.1.gem new file mode 100644 index 000000000..1aab6b484 Binary files /dev/null and b/vendor/cache/dotenv-rails-2.8.1.gem differ diff --git a/vendor/cache/erubi-1.10.0.gem b/vendor/cache/erubi-1.10.0.gem deleted file mode 100644 index 31894cf32..000000000 Binary files a/vendor/cache/erubi-1.10.0.gem and /dev/null differ diff --git a/vendor/cache/erubi-1.12.0.gem b/vendor/cache/erubi-1.12.0.gem new file mode 100644 index 000000000..480dbd4b2 Binary files /dev/null and b/vendor/cache/erubi-1.12.0.gem differ diff --git a/vendor/cache/erubis-2.7.0.gem b/vendor/cache/erubis-2.7.0.gem deleted file mode 100644 index 4acd2e769..000000000 Binary files a/vendor/cache/erubis-2.7.0.gem and /dev/null differ diff --git a/vendor/cache/faraday-2.2.0.gem b/vendor/cache/faraday-2.2.0.gem deleted file mode 100644 index 6eea37988..000000000 Binary files a/vendor/cache/faraday-2.2.0.gem and /dev/null differ diff --git a/vendor/cache/faraday-2.7.4.gem b/vendor/cache/faraday-2.7.4.gem new file mode 100644 index 000000000..7b04dd876 Binary files /dev/null and b/vendor/cache/faraday-2.7.4.gem differ diff --git a/vendor/cache/faraday-net_http-2.0.2.gem b/vendor/cache/faraday-net_http-2.0.2.gem deleted file mode 100644 index d70f64121..000000000 Binary files a/vendor/cache/faraday-net_http-2.0.2.gem and /dev/null differ diff --git a/vendor/cache/faraday-net_http-3.0.2.gem b/vendor/cache/faraday-net_http-3.0.2.gem new file mode 100644 index 000000000..f6b5175c4 Binary files /dev/null and b/vendor/cache/faraday-net_http-3.0.2.gem differ diff --git a/vendor/cache/globalid-1.0.0.gem b/vendor/cache/globalid-1.0.0.gem deleted file mode 100644 index 646070758..000000000 Binary files a/vendor/cache/globalid-1.0.0.gem and /dev/null differ diff --git a/vendor/cache/globalid-1.1.0.gem b/vendor/cache/globalid-1.1.0.gem new file mode 100644 index 000000000..01f9aa3b8 Binary files /dev/null and b/vendor/cache/globalid-1.1.0.gem differ diff --git a/vendor/cache/haml-5.2.2.gem b/vendor/cache/haml-5.2.2.gem deleted file mode 100644 index 6276d3e42..000000000 Binary files a/vendor/cache/haml-5.2.2.gem and /dev/null differ diff --git a/vendor/cache/haml-6.1.1-java.gem b/vendor/cache/haml-6.1.1-java.gem new file mode 100644 index 000000000..a9fd38bbe Binary files /dev/null and b/vendor/cache/haml-6.1.1-java.gem differ diff --git a/vendor/cache/haml-rails-2.0.1.gem b/vendor/cache/haml-rails-2.0.1.gem deleted file mode 100644 index 7acaf7723..000000000 Binary files a/vendor/cache/haml-rails-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/haml-rails-2.1.0.gem b/vendor/cache/haml-rails-2.1.0.gem new file mode 100644 index 000000000..b64f9ec85 Binary files /dev/null and b/vendor/cache/haml-rails-2.1.0.gem differ diff --git a/vendor/cache/highline-2.0.3.gem b/vendor/cache/highline-2.0.3.gem deleted file mode 100644 index 1b2fd6762..000000000 Binary files a/vendor/cache/highline-2.0.3.gem and /dev/null differ diff --git a/vendor/cache/highline-2.1.0.gem b/vendor/cache/highline-2.1.0.gem new file mode 100644 index 000000000..41641f22e Binary files /dev/null and b/vendor/cache/highline-2.1.0.gem differ diff --git a/vendor/cache/html2haml-2.2.0.gem b/vendor/cache/html2haml-2.2.0.gem deleted file mode 100644 index 311163f26..000000000 Binary files a/vendor/cache/html2haml-2.2.0.gem and /dev/null differ diff --git a/vendor/cache/i18n-1.10.0.gem b/vendor/cache/i18n-1.10.0.gem deleted file mode 100644 index a64602b05..000000000 Binary files a/vendor/cache/i18n-1.10.0.gem and /dev/null differ diff --git a/vendor/cache/i18n-1.12.0.gem b/vendor/cache/i18n-1.12.0.gem new file mode 100644 index 000000000..c64c068e6 Binary files /dev/null and b/vendor/cache/i18n-1.12.0.gem differ diff --git a/vendor/cache/jquery-rails-4.4.0.gem b/vendor/cache/jquery-rails-4.4.0.gem deleted file mode 100644 index 2538d5036..000000000 Binary files a/vendor/cache/jquery-rails-4.4.0.gem and /dev/null differ diff --git a/vendor/cache/jquery-rails-4.5.1.gem b/vendor/cache/jquery-rails-4.5.1.gem new file mode 100644 index 000000000..af0ab299f Binary files /dev/null and b/vendor/cache/jquery-rails-4.5.1.gem differ diff --git a/vendor/cache/jruby-jars-9.3.4.0.gem b/vendor/cache/jruby-jars-9.3.9.0.gem similarity index 72% rename from vendor/cache/jruby-jars-9.3.4.0.gem rename to vendor/cache/jruby-jars-9.3.9.0.gem index 5b9a764e8..19ea849bc 100644 Binary files a/vendor/cache/jruby-jars-9.3.4.0.gem and b/vendor/cache/jruby-jars-9.3.9.0.gem differ diff --git a/vendor/cache/jruby-rack-1.1.21.gem b/vendor/cache/jruby-rack-1.1.21.gem deleted file mode 100644 index 0acad1312..000000000 Binary files a/vendor/cache/jruby-rack-1.1.21.gem and /dev/null differ diff --git a/vendor/cache/json-2.6.1-java.gem b/vendor/cache/json-2.6.1-java.gem deleted file mode 100644 index d209a9fb5..000000000 Binary files a/vendor/cache/json-2.6.1-java.gem and /dev/null differ diff --git a/vendor/cache/json-2.6.3-java.gem b/vendor/cache/json-2.6.3-java.gem new file mode 100644 index 000000000..f468be7ed Binary files /dev/null and b/vendor/cache/json-2.6.3-java.gem differ diff --git a/vendor/cache/jwt-2.3.0.gem b/vendor/cache/jwt-2.3.0.gem deleted file mode 100644 index 8c7515209..000000000 Binary files a/vendor/cache/jwt-2.3.0.gem and /dev/null differ diff --git a/vendor/cache/jwt-2.7.0.gem b/vendor/cache/jwt-2.7.0.gem new file mode 100644 index 000000000..65fcb7a2d Binary files /dev/null and b/vendor/cache/jwt-2.7.0.gem differ diff --git a/vendor/cache/loofah-2.17.0.gem b/vendor/cache/loofah-2.17.0.gem deleted file mode 100644 index 0072f5c43..000000000 Binary files a/vendor/cache/loofah-2.17.0.gem and /dev/null differ diff --git a/vendor/cache/loofah-2.19.1.gem b/vendor/cache/loofah-2.19.1.gem new file mode 100644 index 000000000..9ac4d59fc Binary files /dev/null and b/vendor/cache/loofah-2.19.1.gem differ diff --git a/vendor/cache/mail-2.7.1.gem b/vendor/cache/mail-2.7.1.gem deleted file mode 100644 index 066ef0f0f..000000000 Binary files a/vendor/cache/mail-2.7.1.gem and /dev/null differ diff --git a/vendor/cache/mail-2.8.1.gem b/vendor/cache/mail-2.8.1.gem new file mode 100644 index 000000000..2c69b3e60 Binary files /dev/null and b/vendor/cache/mail-2.8.1.gem differ diff --git a/vendor/cache/minitest-5.15.0.gem b/vendor/cache/minitest-5.15.0.gem deleted file mode 100644 index bb3c2475e..000000000 Binary files a/vendor/cache/minitest-5.15.0.gem and /dev/null differ diff --git a/vendor/cache/minitest-5.18.0.gem b/vendor/cache/minitest-5.18.0.gem new file mode 100644 index 000000000..bd1720eec Binary files /dev/null and b/vendor/cache/minitest-5.18.0.gem differ diff --git a/vendor/cache/mocha-1.14.0.gem b/vendor/cache/mocha-1.14.0.gem deleted file mode 100644 index 174eb38bf..000000000 Binary files a/vendor/cache/mocha-1.14.0.gem and /dev/null differ diff --git a/vendor/cache/mocha-2.0.2.gem b/vendor/cache/mocha-2.0.2.gem new file mode 100644 index 000000000..0b2058de2 Binary files /dev/null and b/vendor/cache/mocha-2.0.2.gem differ diff --git a/vendor/cache/net-imap-0.3.4.gem b/vendor/cache/net-imap-0.3.4.gem new file mode 100644 index 000000000..b129422e0 Binary files /dev/null and b/vendor/cache/net-imap-0.3.4.gem differ diff --git a/vendor/cache/net-pop-0.1.2.gem b/vendor/cache/net-pop-0.1.2.gem new file mode 100644 index 000000000..98bcdb7e4 Binary files /dev/null and b/vendor/cache/net-pop-0.1.2.gem differ diff --git a/vendor/cache/net-protocol-0.2.1.gem b/vendor/cache/net-protocol-0.2.1.gem new file mode 100644 index 000000000..60b8794b0 Binary files /dev/null and b/vendor/cache/net-protocol-0.2.1.gem differ diff --git a/vendor/cache/net-scp-3.0.0.gem b/vendor/cache/net-scp-3.0.0.gem deleted file mode 100644 index 4dc2cb9bc..000000000 Binary files a/vendor/cache/net-scp-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/net-scp-4.0.0.gem b/vendor/cache/net-scp-4.0.0.gem new file mode 100644 index 000000000..d687461cd Binary files /dev/null and b/vendor/cache/net-scp-4.0.0.gem differ diff --git a/vendor/cache/net-sftp-3.0.0.gem b/vendor/cache/net-sftp-3.0.0.gem deleted file mode 100644 index ab412d83b..000000000 Binary files a/vendor/cache/net-sftp-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/net-sftp-4.0.0.gem b/vendor/cache/net-sftp-4.0.0.gem new file mode 100644 index 000000000..cc87c454a Binary files /dev/null and b/vendor/cache/net-sftp-4.0.0.gem differ diff --git a/vendor/cache/net-smtp-0.3.3.gem b/vendor/cache/net-smtp-0.3.3.gem new file mode 100644 index 000000000..09fd408d8 Binary files /dev/null and b/vendor/cache/net-smtp-0.3.3.gem differ diff --git a/vendor/cache/net-ssh-6.1.0.gem b/vendor/cache/net-ssh-6.1.0.gem deleted file mode 100644 index 7b22a97a2..000000000 Binary files a/vendor/cache/net-ssh-6.1.0.gem and /dev/null differ diff --git a/vendor/cache/net-ssh-7.1.0.gem b/vendor/cache/net-ssh-7.1.0.gem new file mode 100644 index 000000000..fe1e335e6 Binary files /dev/null and b/vendor/cache/net-ssh-7.1.0.gem differ diff --git a/vendor/cache/nokogiri-1.13.10-java.gem b/vendor/cache/nokogiri-1.13.10-java.gem new file mode 100644 index 000000000..10249d7b4 Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-java.gem differ diff --git a/vendor/cache/nokogiri-1.13.4-java.gem b/vendor/cache/nokogiri-1.13.4-java.gem deleted file mode 100644 index a73f16e83..000000000 Binary files a/vendor/cache/nokogiri-1.13.4-java.gem and /dev/null differ diff --git a/vendor/cache/oauth2-1.4.9.gem b/vendor/cache/oauth2-1.4.9.gem deleted file mode 100644 index b79a1149a..000000000 Binary files a/vendor/cache/oauth2-1.4.9.gem and /dev/null differ diff --git a/vendor/cache/oauth2-2.0.9.gem b/vendor/cache/oauth2-2.0.9.gem new file mode 100644 index 000000000..f875e11d1 Binary files /dev/null and b/vendor/cache/oauth2-2.0.9.gem differ diff --git a/vendor/cache/omniauth-2.1.0.gem b/vendor/cache/omniauth-2.1.0.gem deleted file mode 100644 index 5d8c445a7..000000000 Binary files a/vendor/cache/omniauth-2.1.0.gem and /dev/null differ diff --git a/vendor/cache/omniauth-2.1.1.gem b/vendor/cache/omniauth-2.1.1.gem new file mode 100644 index 000000000..81fe591a6 Binary files /dev/null and b/vendor/cache/omniauth-2.1.1.gem differ diff --git a/vendor/cache/omniauth-google-oauth2-1.0.1.gem b/vendor/cache/omniauth-google-oauth2-1.0.1.gem deleted file mode 100644 index 289196ed7..000000000 Binary files a/vendor/cache/omniauth-google-oauth2-1.0.1.gem and /dev/null differ diff --git a/vendor/cache/omniauth-google-oauth2-1.1.1.gem b/vendor/cache/omniauth-google-oauth2-1.1.1.gem new file mode 100644 index 000000000..9c59eb69f Binary files /dev/null and b/vendor/cache/omniauth-google-oauth2-1.1.1.gem differ diff --git a/vendor/cache/omniauth-oauth2-1.7.2.gem b/vendor/cache/omniauth-oauth2-1.7.2.gem deleted file mode 100644 index d2d98cfb5..000000000 Binary files a/vendor/cache/omniauth-oauth2-1.7.2.gem and /dev/null differ diff --git a/vendor/cache/omniauth-oauth2-1.8.0.gem b/vendor/cache/omniauth-oauth2-1.8.0.gem new file mode 100644 index 000000000..3e58a53bf Binary files /dev/null and b/vendor/cache/omniauth-oauth2-1.8.0.gem differ diff --git a/vendor/cache/parser-3.1.2.0.gem b/vendor/cache/parser-3.1.2.0.gem deleted file mode 100644 index d2ce30ac2..000000000 Binary files a/vendor/cache/parser-3.1.2.0.gem and /dev/null differ diff --git a/vendor/cache/parser-3.2.1.1.gem b/vendor/cache/parser-3.2.1.1.gem new file mode 100644 index 000000000..0b76139df Binary files /dev/null and b/vendor/cache/parser-3.2.1.1.gem differ diff --git a/vendor/cache/pry-0.14.1-java.gem b/vendor/cache/pry-0.14.1-java.gem deleted file mode 100644 index a0eb85561..000000000 Binary files a/vendor/cache/pry-0.14.1-java.gem and /dev/null differ diff --git a/vendor/cache/pry-0.14.2-java.gem b/vendor/cache/pry-0.14.2-java.gem new file mode 100644 index 000000000..7f7b0de00 Binary files /dev/null and b/vendor/cache/pry-0.14.2-java.gem differ diff --git a/vendor/cache/puma-5.6.4-java.gem b/vendor/cache/puma-5.6.4-java.gem deleted file mode 100644 index b12e023e1..000000000 Binary files a/vendor/cache/puma-5.6.4-java.gem and /dev/null differ diff --git a/vendor/cache/puma-6.1.1-java.gem b/vendor/cache/puma-6.1.1-java.gem new file mode 100644 index 000000000..9f300ffa3 Binary files /dev/null and b/vendor/cache/puma-6.1.1-java.gem differ diff --git a/vendor/cache/racc-1.6.0-java.gem b/vendor/cache/racc-1.6.0-java.gem deleted file mode 100644 index 7c088341a..000000000 Binary files a/vendor/cache/racc-1.6.0-java.gem and /dev/null differ diff --git a/vendor/cache/racc-1.6.2-java.gem b/vendor/cache/racc-1.6.2-java.gem new file mode 100644 index 000000000..25d62ebd5 Binary files /dev/null and b/vendor/cache/racc-1.6.2-java.gem differ diff --git a/vendor/cache/rack-2.2.3.gem b/vendor/cache/rack-2.2.3.gem deleted file mode 100644 index 19fa2e9ff..000000000 Binary files a/vendor/cache/rack-2.2.3.gem and /dev/null differ diff --git a/vendor/cache/rack-2.2.6.4.gem b/vendor/cache/rack-2.2.6.4.gem new file mode 100644 index 000000000..2ca789da6 Binary files /dev/null and b/vendor/cache/rack-2.2.6.4.gem differ diff --git a/vendor/cache/rack-attack-4.4.1.gem b/vendor/cache/rack-attack-4.4.1.gem deleted file mode 100644 index 5f40c6550..000000000 Binary files a/vendor/cache/rack-attack-4.4.1.gem and /dev/null differ diff --git a/vendor/cache/rack-attack-6.6.1.gem b/vendor/cache/rack-attack-6.6.1.gem new file mode 100644 index 000000000..e897b6405 Binary files /dev/null and b/vendor/cache/rack-attack-6.6.1.gem differ diff --git a/vendor/cache/rack-protection-2.2.0.gem b/vendor/cache/rack-protection-2.2.0.gem deleted file mode 100644 index 1e2d08f9a..000000000 Binary files a/vendor/cache/rack-protection-2.2.0.gem and /dev/null differ diff --git a/vendor/cache/rack-protection-3.0.5.gem b/vendor/cache/rack-protection-3.0.5.gem new file mode 100644 index 000000000..32f3714b7 Binary files /dev/null and b/vendor/cache/rack-protection-3.0.5.gem differ diff --git a/vendor/cache/rack-test-1.1.0.gem b/vendor/cache/rack-test-1.1.0.gem deleted file mode 100644 index 3fb2d3a8f..000000000 Binary files a/vendor/cache/rack-test-1.1.0.gem and /dev/null differ diff --git a/vendor/cache/rack-test-2.1.0.gem b/vendor/cache/rack-test-2.1.0.gem new file mode 100644 index 000000000..acba7ba84 Binary files /dev/null and b/vendor/cache/rack-test-2.1.0.gem differ diff --git a/vendor/cache/rack-utf8_sanitizer-1.7.0.gem b/vendor/cache/rack-utf8_sanitizer-1.7.0.gem deleted file mode 100644 index a152172cf..000000000 Binary files a/vendor/cache/rack-utf8_sanitizer-1.7.0.gem and /dev/null differ diff --git a/vendor/cache/rack-utf8_sanitizer-1.8.0.gem b/vendor/cache/rack-utf8_sanitizer-1.8.0.gem new file mode 100644 index 000000000..239352b89 Binary files /dev/null and b/vendor/cache/rack-utf8_sanitizer-1.8.0.gem differ diff --git a/vendor/cache/rails-6.1.5.1.gem b/vendor/cache/rails-6.1.5.1.gem deleted file mode 100644 index 06b8fb019..000000000 Binary files a/vendor/cache/rails-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/rails-6.1.7.3.gem b/vendor/cache/rails-6.1.7.3.gem new file mode 100644 index 000000000..26a7e96df Binary files /dev/null and b/vendor/cache/rails-6.1.7.3.gem differ diff --git a/vendor/cache/rails-html-sanitizer-1.4.2.gem b/vendor/cache/rails-html-sanitizer-1.4.2.gem deleted file mode 100644 index aab9fa6cf..000000000 Binary files a/vendor/cache/rails-html-sanitizer-1.4.2.gem and /dev/null differ diff --git a/vendor/cache/rails-html-sanitizer-1.5.0.gem b/vendor/cache/rails-html-sanitizer-1.5.0.gem new file mode 100644 index 000000000..d101a1fac Binary files /dev/null and b/vendor/cache/rails-html-sanitizer-1.5.0.gem differ diff --git a/vendor/cache/railties-6.1.5.1.gem b/vendor/cache/railties-6.1.5.1.gem deleted file mode 100644 index b72eec5c0..000000000 Binary files a/vendor/cache/railties-6.1.5.1.gem and /dev/null differ diff --git a/vendor/cache/railties-6.1.7.3.gem b/vendor/cache/railties-6.1.7.3.gem new file mode 100644 index 000000000..70faf8cf0 Binary files /dev/null and b/vendor/cache/railties-6.1.7.3.gem differ diff --git a/vendor/cache/rb-fsevent-0.11.1.gem b/vendor/cache/rb-fsevent-0.11.1.gem deleted file mode 100644 index db04ee0ef..000000000 Binary files a/vendor/cache/rb-fsevent-0.11.1.gem and /dev/null differ diff --git a/vendor/cache/rb-fsevent-0.11.2.gem b/vendor/cache/rb-fsevent-0.11.2.gem new file mode 100644 index 000000000..e64526633 Binary files /dev/null and b/vendor/cache/rb-fsevent-0.11.2.gem differ diff --git a/vendor/cache/regexp_parser-2.3.1.gem b/vendor/cache/regexp_parser-2.3.1.gem deleted file mode 100644 index 89a758122..000000000 Binary files a/vendor/cache/regexp_parser-2.3.1.gem and /dev/null differ diff --git a/vendor/cache/regexp_parser-2.7.0.gem b/vendor/cache/regexp_parser-2.7.0.gem new file mode 100644 index 000000000..28afa9ce4 Binary files /dev/null and b/vendor/cache/regexp_parser-2.7.0.gem differ diff --git a/vendor/cache/responders-3.0.1.gem b/vendor/cache/responders-3.0.1.gem deleted file mode 100644 index 76ae09afd..000000000 Binary files a/vendor/cache/responders-3.0.1.gem and /dev/null differ diff --git a/vendor/cache/responders-3.1.0.gem b/vendor/cache/responders-3.1.0.gem new file mode 100644 index 000000000..0e60d68b1 Binary files /dev/null and b/vendor/cache/responders-3.1.0.gem differ diff --git a/vendor/cache/rubocop-1.28.2.gem b/vendor/cache/rubocop-1.28.2.gem deleted file mode 100644 index 4eef195ed..000000000 Binary files a/vendor/cache/rubocop-1.28.2.gem and /dev/null differ diff --git a/vendor/cache/rubocop-1.48.1.gem b/vendor/cache/rubocop-1.48.1.gem new file mode 100644 index 000000000..a08d2f1a2 Binary files /dev/null and b/vendor/cache/rubocop-1.48.1.gem differ diff --git a/vendor/cache/rubocop-ast-1.17.0.gem b/vendor/cache/rubocop-ast-1.17.0.gem deleted file mode 100644 index 48a86cb79..000000000 Binary files a/vendor/cache/rubocop-ast-1.17.0.gem and /dev/null differ diff --git a/vendor/cache/rubocop-ast-1.27.0.gem b/vendor/cache/rubocop-ast-1.27.0.gem new file mode 100644 index 000000000..f1ced19ac Binary files /dev/null and b/vendor/cache/rubocop-ast-1.27.0.gem differ diff --git a/vendor/cache/rubocop-minitest-0.19.1.gem b/vendor/cache/rubocop-minitest-0.19.1.gem deleted file mode 100644 index aead1ace1..000000000 Binary files a/vendor/cache/rubocop-minitest-0.19.1.gem and /dev/null differ diff --git a/vendor/cache/rubocop-minitest-0.29.0.gem b/vendor/cache/rubocop-minitest-0.29.0.gem new file mode 100644 index 000000000..ca662a640 Binary files /dev/null and b/vendor/cache/rubocop-minitest-0.29.0.gem differ diff --git a/vendor/cache/rubocop-performance-1.13.3.gem b/vendor/cache/rubocop-performance-1.13.3.gem deleted file mode 100644 index 17ca04350..000000000 Binary files a/vendor/cache/rubocop-performance-1.13.3.gem and /dev/null differ diff --git a/vendor/cache/rubocop-performance-1.16.0.gem b/vendor/cache/rubocop-performance-1.16.0.gem new file mode 100644 index 000000000..3b6b0ecc8 Binary files /dev/null and b/vendor/cache/rubocop-performance-1.16.0.gem differ diff --git a/vendor/cache/rubocop-rails-2.14.2.gem b/vendor/cache/rubocop-rails-2.14.2.gem deleted file mode 100644 index 83012f896..000000000 Binary files a/vendor/cache/rubocop-rails-2.14.2.gem and /dev/null differ diff --git a/vendor/cache/rubocop-rails-2.18.0.gem b/vendor/cache/rubocop-rails-2.18.0.gem new file mode 100644 index 000000000..e271f234c Binary files /dev/null and b/vendor/cache/rubocop-rails-2.18.0.gem differ diff --git a/vendor/cache/ruby-progressbar-1.11.0.gem b/vendor/cache/ruby-progressbar-1.11.0.gem deleted file mode 100644 index a9d84e50b..000000000 Binary files a/vendor/cache/ruby-progressbar-1.11.0.gem and /dev/null differ diff --git a/vendor/cache/ruby-progressbar-1.13.0.gem b/vendor/cache/ruby-progressbar-1.13.0.gem new file mode 100644 index 000000000..c50b94b26 Binary files /dev/null and b/vendor/cache/ruby-progressbar-1.13.0.gem differ diff --git a/vendor/cache/ruby_parser-3.19.1.gem b/vendor/cache/ruby_parser-3.19.1.gem deleted file mode 100644 index 99e9daaba..000000000 Binary files a/vendor/cache/ruby_parser-3.19.1.gem and /dev/null differ diff --git a/vendor/cache/rubyzip-1.3.0.gem b/vendor/cache/rubyzip-1.3.0.gem deleted file mode 100644 index 95fb164ec..000000000 Binary files a/vendor/cache/rubyzip-1.3.0.gem and /dev/null differ diff --git a/vendor/cache/rubyzip-2.3.2.gem b/vendor/cache/rubyzip-2.3.2.gem new file mode 100644 index 000000000..36fdea607 Binary files /dev/null and b/vendor/cache/rubyzip-2.3.2.gem differ diff --git a/vendor/cache/sass-rails-5.1.0.gem b/vendor/cache/sass-rails-5.1.0.gem deleted file mode 100644 index 587fd3936..000000000 Binary files a/vendor/cache/sass-rails-5.1.0.gem and /dev/null differ diff --git a/vendor/cache/sass-rails-6.0.0.gem b/vendor/cache/sass-rails-6.0.0.gem new file mode 100644 index 000000000..89aa8aef3 Binary files /dev/null and b/vendor/cache/sass-rails-6.0.0.gem differ diff --git a/vendor/cache/sassc-2.4.0.gem b/vendor/cache/sassc-2.4.0.gem new file mode 100644 index 000000000..a8e2e1f28 Binary files /dev/null and b/vendor/cache/sassc-2.4.0.gem differ diff --git a/vendor/cache/sassc-rails-2.1.2.gem b/vendor/cache/sassc-rails-2.1.2.gem new file mode 100644 index 000000000..a599113ac Binary files /dev/null and b/vendor/cache/sassc-rails-2.1.2.gem differ diff --git a/vendor/cache/sexp_processor-4.16.1.gem b/vendor/cache/sexp_processor-4.16.1.gem deleted file mode 100644 index caaef3ed5..000000000 Binary files a/vendor/cache/sexp_processor-4.16.1.gem and /dev/null differ diff --git a/vendor/cache/shoulda-4.0.0.gem b/vendor/cache/shoulda-4.0.0.gem deleted file mode 100644 index 3f271dc15..000000000 Binary files a/vendor/cache/shoulda-4.0.0.gem and /dev/null differ diff --git a/vendor/cache/shoulda-matchers-4.5.1.gem b/vendor/cache/shoulda-matchers-4.5.1.gem deleted file mode 100644 index 1be63770b..000000000 Binary files a/vendor/cache/shoulda-matchers-4.5.1.gem and /dev/null differ diff --git a/vendor/cache/shoulda-matchers-5.3.0.gem b/vendor/cache/shoulda-matchers-5.3.0.gem new file mode 100644 index 000000000..e764fcf6c Binary files /dev/null and b/vendor/cache/shoulda-matchers-5.3.0.gem differ diff --git a/vendor/cache/snaky_hash-2.0.1.gem b/vendor/cache/snaky_hash-2.0.1.gem new file mode 100644 index 000000000..7f75a8534 Binary files /dev/null and b/vendor/cache/snaky_hash-2.0.1.gem differ diff --git a/vendor/cache/sprockets-3.7.2.gem b/vendor/cache/sprockets-3.7.2.gem deleted file mode 100644 index d74211a29..000000000 Binary files a/vendor/cache/sprockets-3.7.2.gem and /dev/null differ diff --git a/vendor/cache/sprockets-4.2.0.gem b/vendor/cache/sprockets-4.2.0.gem new file mode 100644 index 000000000..efc0662bc Binary files /dev/null and b/vendor/cache/sprockets-4.2.0.gem differ diff --git a/vendor/cache/sucker_punch-2.1.2.gem b/vendor/cache/sucker_punch-2.1.2.gem deleted file mode 100644 index 1f72925f9..000000000 Binary files a/vendor/cache/sucker_punch-2.1.2.gem and /dev/null differ diff --git a/vendor/cache/sucker_punch-3.1.0.gem b/vendor/cache/sucker_punch-3.1.0.gem new file mode 100644 index 000000000..4d294a2fb Binary files /dev/null and b/vendor/cache/sucker_punch-3.1.0.gem differ diff --git a/vendor/cache/temple-0.10.0.gem b/vendor/cache/temple-0.10.0.gem new file mode 100644 index 000000000..eba565144 Binary files /dev/null and b/vendor/cache/temple-0.10.0.gem differ diff --git a/vendor/cache/temple-0.8.2.gem b/vendor/cache/temple-0.8.2.gem deleted file mode 100644 index 85f7205be..000000000 Binary files a/vendor/cache/temple-0.8.2.gem and /dev/null differ diff --git a/vendor/cache/tilt-2.0.10.gem b/vendor/cache/tilt-2.0.10.gem deleted file mode 100644 index b432e1590..000000000 Binary files a/vendor/cache/tilt-2.0.10.gem and /dev/null differ diff --git a/vendor/cache/tilt-2.1.0.gem b/vendor/cache/tilt-2.1.0.gem new file mode 100644 index 000000000..bf209fa80 Binary files /dev/null and b/vendor/cache/tilt-2.1.0.gem differ diff --git a/vendor/cache/timeout-0.3.2.gem b/vendor/cache/timeout-0.3.2.gem new file mode 100644 index 000000000..201947fda Binary files /dev/null and b/vendor/cache/timeout-0.3.2.gem differ diff --git a/vendor/cache/tzinfo-2.0.4.gem b/vendor/cache/tzinfo-2.0.4.gem deleted file mode 100644 index a3f982055..000000000 Binary files a/vendor/cache/tzinfo-2.0.4.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-2.0.6.gem b/vendor/cache/tzinfo-2.0.6.gem new file mode 100644 index 000000000..2c16da8ab Binary files /dev/null and b/vendor/cache/tzinfo-2.0.6.gem differ diff --git a/vendor/cache/tzinfo-data-1.2022.1.gem b/vendor/cache/tzinfo-data-1.2022.1.gem deleted file mode 100644 index 1aa5ba673..000000000 Binary files a/vendor/cache/tzinfo-data-1.2022.1.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-data-1.2022.7.gem b/vendor/cache/tzinfo-data-1.2022.7.gem new file mode 100644 index 000000000..69e2211ad Binary files /dev/null and b/vendor/cache/tzinfo-data-1.2022.7.gem differ diff --git a/vendor/cache/unicode-display_width-2.1.0.gem b/vendor/cache/unicode-display_width-2.1.0.gem deleted file mode 100644 index bec8f2a7c..000000000 Binary files a/vendor/cache/unicode-display_width-2.1.0.gem and /dev/null differ diff --git a/vendor/cache/unicode-display_width-2.4.2.gem b/vendor/cache/unicode-display_width-2.4.2.gem new file mode 100644 index 000000000..4402c5dd9 Binary files /dev/null and b/vendor/cache/unicode-display_width-2.4.2.gem differ diff --git a/vendor/cache/version_gem-1.1.1.gem b/vendor/cache/version_gem-1.1.1.gem new file mode 100644 index 000000000..7430b4ee7 Binary files /dev/null and b/vendor/cache/version_gem-1.1.1.gem differ diff --git a/vendor/cache/warbler-2.0.5.gem b/vendor/cache/warbler-2.0.5.gem deleted file mode 100644 index b260949d1..000000000 Binary files a/vendor/cache/warbler-2.0.5.gem and /dev/null differ diff --git a/vendor/cache/webrick-1.8.1.gem b/vendor/cache/webrick-1.8.1.gem new file mode 100644 index 000000000..ac0894b9c Binary files /dev/null and b/vendor/cache/webrick-1.8.1.gem differ diff --git a/vendor/cache/zeitwerk-2.5.4.gem b/vendor/cache/zeitwerk-2.5.4.gem deleted file mode 100644 index 7c967d441..000000000 Binary files a/vendor/cache/zeitwerk-2.5.4.gem and /dev/null differ diff --git a/vendor/cache/zeitwerk-2.6.7.gem b/vendor/cache/zeitwerk-2.6.7.gem new file mode 100644 index 000000000..611bd261f Binary files /dev/null and b/vendor/cache/zeitwerk-2.6.7.gem differ