diff --git a/.rubocop.yml b/.rubocop.yml index 112c096d47..853f19f28c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,21 @@ +inherit_from: .rubocop_todo.yml + +require: + - rubocop-performance + - rubocop-rails + - rubocop-rspec + AllCops: - TargetRubyVersion: 2.4 + TargetRubyVersion: 2.6 + CacheRootDirectory: ./tmp + # https://github.com/thoughtbot/factory_bot/issues/1160#issuecomment-421410237 + RSpec: + Patterns: + - _test.rb + - "(?:^|/)test/" + RSpec/FactoryBot: + Patterns: + - test/factories/**/*.rb Include: - '**/Rakefile' - '**/config.ru' @@ -8,15 +24,16 @@ AllCops: - 'db/**/*' - 'script/**/*' - 'vendor/**/*' + - 'vendor/**/.*' - 'node_modules/**/*' Rails: Enabled: true -TrailingBlankLines: +Layout/TrailingBlankLines: Enabled: true -Documentation: +Style/Documentation: Enabled: false Metrics/LineLength: @@ -45,7 +62,7 @@ Rails/UnknownEnv: - staging - production -Style/FileName: +Naming/FileName: Exclude: - 'Gemfile' - 'Guardfile' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Gemfile b/Gemfile index 0146dbdea5..6607295f1c 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ git_source(:github) do |repo_name| end ruby File.read(File.expand_path("../.ruby-version", __FILE__)).chomp -gem "rails", "~> 5.2.3" +gem "rails", "~> 6.0.1" gem "autoprefixer-rails", "~> 7.1", ">= 7.1.3" @@ -62,15 +62,15 @@ gem "puma", "~> 4.0", ">= 4.0.1" gem "rack-canonical-host", "~> 0.2.3" gem "rack-rewrite", "~> 1.5.0" gem "rack-timeout", "~> 0.5.1", require: false -gem "rails-i18n", "~> 5.1", ">= 5.1.3" +gem "rails-i18n", "~> 6.0" gem "redis-namespace", "~> 1.5", ">= 1.5.3" gem "ruby-progressbar", "~> 1.8", ">= 1.8.1", require: false gem "kramdown", "~> 1.17.0" -gem "sass-rails", "~> 5.0", ">= 5.0.6" +gem "sass-rails", "~> 6.0" gem "sidekiq", "~> 5.2", ">= 5.2.7" -gem "sprockets", "~> 3.7", ">= 3.7.2" +gem "sprockets", "~> 3.7.2" gem "turbolinks", "~> 2.5", ">= 2.5.4" gem "typhoeus", "~> 1.3" @@ -90,8 +90,11 @@ group :development, :test do gem "guard-rspec", "~> 4.7", ">= 4.7.3", require: false gem "knapsack", "~> 1.14", ">= 1.14.1" gem "rails-controller-testing", "~> 1.0", ">= 1.0.4" - gem "rspec-rails", "~> 3.6", ">= 3.6.1" - gem "rubocop", "~> 0.49.1", require: false + gem "rspec-rails", ">= 4.0.0.beta3" + gem "rubocop", "~> 0.74", :require => false + gem "rubocop-performance", "~> 1.4", :require => false + gem "rubocop-rails", "~> 2.3", :require => false + gem "rubocop-rspec", "~> 1.30", ">= 1.30.1", require: false gem "scss_lint", "~> 0.54.0", require: false gem "spring", "~> 2.1", ">= 2.1.0" gem "spring-watcher-listen", "~> 2.0", ">= 2.0.1" @@ -109,7 +112,7 @@ group :production do end group :test do - gem "action-cable-testing", "~> 0.3" + gem "action-cable-testing", "~> 0.6.0" gem "database_cleaner", "~> 1.6", ">= 1.6.1" gem "factory_bot_rails", "~> 4.8" gem "faker", "~> 1.8", ">= 1.8.4" diff --git a/Gemfile.lock b/Gemfile.lock index cacfe95ec9..01cfd77c78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,60 +8,73 @@ GIT GEM remote: https://rubygems.org/ specs: - action-cable-testing (0.3.1) - actioncable (~> 5.0) - actioncable (5.2.3) - actionpack (= 5.2.3) + action-cable-testing (0.6.0) + actioncable (>= 5.0) + actioncable (6.0.1) + actionpack (= 6.0.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) + actionmailbox (6.0.1) + actionpack (= 6.0.1) + activejob (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) + mail (>= 2.7.1) + actionmailer (6.0.1) + actionpack (= 6.0.1) + actionview (= 6.0.1) + activejob (= 6.0.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) + actionpack (6.0.1) + actionview (= 6.0.1) + activesupport (= 6.0.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.1) + actionpack (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) + nokogiri (>= 1.8.5) + actionview (6.0.1) + activesupport (= 6.0.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.10.7) - actionpack (>= 4.1, < 6) - activemodel (>= 4.1, < 6) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + active_model_serializers (0.10.10) + actionpack (>= 4.1, < 6.1) + activemodel (>= 4.1, < 6.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.2.3) - activesupport (= 5.2.3) + activejob (6.0.1) + activesupport (= 6.0.1) globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) - arel (>= 9.0) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) + activemodel (6.0.1) + activesupport (= 6.0.1) + activerecord (6.0.1) + activemodel (= 6.0.1) + activesupport (= 6.0.1) + activestorage (6.0.1) + actionpack (= 6.0.1) + activejob (= 6.0.1) + activerecord (= 6.0.1) marcel (~> 0.3.1) - activesupport (5.2.3) + activesupport (6.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) api-pagination (4.7.1) - arel (9.0.0) - ast (2.3.0) + ast (2.4.0) atomic (1.1.101) autoprefixer-rails (7.1.3) execjs @@ -74,7 +87,7 @@ GEM bootsnap (1.4.4) msgpack (~> 1.0) builder (3.2.3) - bullet (6.0.1) + bullet (6.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.0.1) @@ -107,7 +120,7 @@ GEM dotenv-rails (2.7.4) dotenv (= 2.7.4) railties (>= 3.2, < 6.1) - erubi (1.8.0) + erubi (1.9.0) erubis (2.7.0) ethon (0.10.1) ffi (>= 1.3.0) @@ -190,6 +203,7 @@ GEM faraday_middleware (~> 0.8) json-jwt (~> 1.7) simple_oauth (~> 0.3.1) + jaro_winkler (1.5.4) jquery-datetimepicker-rails (2.4.1.0) jquery-turbolinks (2.1.0) railties (>= 3.1.0) @@ -199,7 +213,7 @@ GEM activesupport (>= 4.2) aes_key_wrap bindata - jsonapi-renderer (0.2.0) + jsonapi-renderer (0.2.2) jwt (1.5.6) kaminari (1.0.1) activesupport (>= 4.1.0) @@ -249,7 +263,7 @@ GEM multipart-post (2.1.1) nenv (0.3.0) newrelic_rpm (6.5.0.357) - nio4r (2.4.0) + nio4r (2.5.2) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) notiffany (0.1.1) @@ -278,9 +292,9 @@ GEM oauth2 (~> 1.0) omniauth (~> 1.2) os (1.0.1) - parallel (1.12.0) - parser (2.4.0.0) - ast (~> 2.2) + parallel (1.19.1) + parser (2.6.5.0) + ast (~> 2.4.0) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -311,7 +325,6 @@ GEM activesupport (>= 4.2) pinglish (0.2.1) rack - powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -341,18 +354,20 @@ GEM activesupport (>= 3.0) rack (>= 1.4) tilt (>= 1.4) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) + rails (6.0.1) + actioncable (= 6.0.1) + actionmailbox (= 6.0.1) + actionmailer (= 6.0.1) + actionpack (= 6.0.1) + actiontext (= 6.0.1) + actionview (= 6.0.1) + activejob (= 6.0.1) + activemodel (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) bundler (>= 1.3.0) - railties (= 5.2.3) + railties (= 6.0.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -361,19 +376,18 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.3) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + rails-i18n (6.0.0) i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) + railties (>= 6.0.0, < 7) + railties (6.0.1) + actionpack (= 6.0.1) + activesupport (= 6.0.1) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rainbow (2.2.2) - rake + thor (>= 0.20.3, < 2.0) + rainbow (3.0.0) rake (12.3.3) rb-fsevent (0.10.2) rb-inotify (0.9.10) @@ -388,44 +402,55 @@ GEM request_store (1.4.1) rack (>= 1.4) retriable (3.1.2) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) - rubocop (0.49.1) + rspec-support (~> 3.9.0) + rspec-rails (4.0.0.beta3) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.8) + rspec-expectations (~> 3.8) + rspec-mocks (~> 3.8) + rspec-support (~> 3.8) + rspec-support (3.9.0) + rubocop (0.76.0) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + parser (>= 2.6) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-performance (1.5.1) + rubocop (>= 0.71.0) + rubocop-rails (2.3.2) + rack (>= 1.1) + rubocop (>= 0.72.0) + rubocop-rspec (1.36.0) + rubocop (>= 0.68.1) + ruby-progressbar (1.10.1) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.4.25) - sass-rails (5.0.6) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) @@ -478,9 +503,9 @@ GEM uber (0.1.0) uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unicode-display_width (1.3.0) + unicode-display_width (1.6.0) unicode-emoji (1.1.0) - uniform_notifier (1.12.1) + uniform_notifier (1.13.0) vcr (3.0.3) web-console (3.5.1) actionview (>= 5.0) @@ -494,12 +519,13 @@ GEM websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) + zeitwerk (2.2.1) PLATFORMS ruby DEPENDENCIES - action-cable-testing (~> 0.3) + action-cable-testing (~> 0.6.0) active_model_serializers (~> 0.10.0) api-pagination (= 4.7.1) autoprefixer-rails (~> 7.1, >= 7.1.3) @@ -557,21 +583,24 @@ DEPENDENCIES rack-rewrite (~> 1.5.0) rack-timeout (~> 0.5.1) rack-tracker (~> 1.11.1) - rails (~> 5.2.3) + rails (~> 6.0.1) rails-controller-testing (~> 1.0, >= 1.0.4) - rails-i18n (~> 5.1, >= 5.1.3) + rails-i18n (~> 6.0) redis-namespace (~> 1.5, >= 1.5.3) - rspec-rails (~> 3.6, >= 3.6.1) - rubocop (~> 0.49.1) + rspec-rails (>= 4.0.0.beta3) + rubocop (~> 0.74) + rubocop-performance (~> 1.4) + rubocop-rails (~> 2.3) + rubocop-rspec (~> 1.30, >= 1.30.1) ruby-progressbar (~> 1.8, >= 1.8.1) - sass-rails (~> 5.0, >= 5.0.6) + sass-rails (~> 6.0) scss_lint (~> 0.54.0) shoulda-matchers (= 4.0.0.rc1) sidekiq (~> 5.2, >= 5.2.7) simplecov (~> 0.15.0) spring (~> 2.1, >= 2.1.0) spring-watcher-listen (~> 2.0, >= 2.0.1) - sprockets (~> 3.7, >= 3.7.2) + sprockets (~> 3.7.2) terminal-notifier-guard (~> 1.7) timecop (~> 0.9.1) turbolinks (~> 2.5, >= 2.5.4) diff --git a/Rakefile b/Rakefile index 3e984fc665..956b8c5634 100644 --- a/Rakefile +++ b/Rakefile @@ -3,7 +3,7 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. -require File.expand_path("../config/application", __FILE__) +require File.expand_path("config/application", __dir__) Rails.application.load_tasks Knapsack.load_tasks if defined?(Knapsack) diff --git a/db/schema.rb b/db/schema.rb index 7c53e1d9ff..9f1ac94b3c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2,11 +2,11 @@ # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. # -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. # # It's strongly recommended that you check this file into your version control system. diff --git a/spec/channels/group_repository_creation_status_channel_spec.rb b/spec/channels/group_repository_creation_status_channel_spec.rb index d26a099ef7..146c745974 100644 --- a/spec/channels/group_repository_creation_status_channel_spec.rb +++ b/spec/channels/group_repository_creation_status_channel_spec.rb @@ -8,6 +8,6 @@ it "subscribes to stream" do stub_connection current_user: student subscribe(group_id: 1, group_assignment_id: 1) - expect(streams).to include(GroupRepositoryCreationStatusChannel.channel(group_id: 1, group_assignment_id: 1)) + assert_has_stream GroupRepositoryCreationStatusChannel.channel(group_id: 1, group_assignment_id: 1) end end diff --git a/spec/channels/repository_creation_status_channel_spec.rb b/spec/channels/repository_creation_status_channel_spec.rb index 06c4b80551..8b28a519e2 100644 --- a/spec/channels/repository_creation_status_channel_spec.rb +++ b/spec/channels/repository_creation_status_channel_spec.rb @@ -8,6 +8,6 @@ it "subscribes to stream" do stub_connection current_user: student subscribe(assignment_id: 1) - expect(streams).to include(RepositoryCreationStatusChannel.channel(user_id: student.id, assignment_id: 1)) + assert_has_stream RepositoryCreationStatusChannel.channel(user_id: student.id, assignment_id: 1) end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index a233a64492..f01158a36d 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -8,7 +8,6 @@ abort("The Rails environment is running in production mode!") if Rails.env.production? require "spec_helper" require "rspec/rails" -require "action_cable/testing/rspec" # Add additional requires below this line. Rails is not loaded until this point! diff --git a/spec/support/bullet.rb b/spec/support/bullet.rb index 0315094372..af6ad4156f 100644 --- a/spec/support/bullet.rb +++ b/spec/support/bullet.rb @@ -1,17 +1,15 @@ # frozen_string_literal: true if defined?(Bullet) && Bullet.enable? + # There's an issue with the gem that results in false positives in tests. The + # recommendation is to disable this until it's fixed https://github.com/flyerhzm/bullet/issues/481 + Bullet.unused_eager_loading_enable = false + RSpec.configure do |config| config.before(:each) do Bullet.start_request end - config.around(:each, type: :controller) do |example| - Bullet.unused_eager_loading_enable = false - example.run - Bullet.unused_eager_loading_enable = true - end - config.after(:each) do Bullet.perform_out_of_channel_notifications if Bullet.notification? Bullet.end_request diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb index af5241b4bd..582e932ff2 100644 --- a/spec/support/database_cleaner.rb +++ b/spec/support/database_cleaner.rb @@ -3,7 +3,10 @@ RSpec.configure do |config| config.before(:suite) do DatabaseCleaner.strategy = :transaction - DatabaseCleaner.clean_with :truncation + DatabaseCleaner.clean_with( + :truncation, + except: %w[ar_internal_metadata] + ) end config.before(:each) do diff --git a/vendor/cache/action-cable-testing-0.3.1.gem b/vendor/cache/action-cable-testing-0.3.1.gem deleted file mode 100644 index 7623c60ce2..0000000000 Binary files a/vendor/cache/action-cable-testing-0.3.1.gem and /dev/null differ diff --git a/vendor/cache/action-cable-testing-0.6.0.gem b/vendor/cache/action-cable-testing-0.6.0.gem new file mode 100644 index 0000000000..33b785063e Binary files /dev/null and b/vendor/cache/action-cable-testing-0.6.0.gem differ diff --git a/vendor/cache/actioncable-5.2.3.gem b/vendor/cache/actioncable-5.2.3.gem deleted file mode 100644 index a85488c675..0000000000 Binary files a/vendor/cache/actioncable-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/actioncable-6.0.1.gem b/vendor/cache/actioncable-6.0.1.gem new file mode 100644 index 0000000000..a656a10afb Binary files /dev/null and b/vendor/cache/actioncable-6.0.1.gem differ diff --git a/vendor/cache/actionmailbox-6.0.1.gem b/vendor/cache/actionmailbox-6.0.1.gem new file mode 100644 index 0000000000..65c8ae9e1f Binary files /dev/null and b/vendor/cache/actionmailbox-6.0.1.gem differ diff --git a/vendor/cache/actionmailer-5.2.3.gem b/vendor/cache/actionmailer-5.2.3.gem deleted file mode 100644 index 36135a73ec..0000000000 Binary files a/vendor/cache/actionmailer-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-6.0.1.gem b/vendor/cache/actionmailer-6.0.1.gem new file mode 100644 index 0000000000..0a4ae16722 Binary files /dev/null and b/vendor/cache/actionmailer-6.0.1.gem differ diff --git a/vendor/cache/actionpack-5.2.3.gem b/vendor/cache/actionpack-5.2.3.gem deleted file mode 100644 index a9c46cd18c..0000000000 Binary files a/vendor/cache/actionpack-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/actionpack-6.0.1.gem b/vendor/cache/actionpack-6.0.1.gem new file mode 100644 index 0000000000..c75af14374 Binary files /dev/null and b/vendor/cache/actionpack-6.0.1.gem differ diff --git a/vendor/cache/actiontext-6.0.1.gem b/vendor/cache/actiontext-6.0.1.gem new file mode 100644 index 0000000000..51c00490e2 Binary files /dev/null and b/vendor/cache/actiontext-6.0.1.gem differ diff --git a/vendor/cache/actionview-5.2.3.gem b/vendor/cache/actionview-5.2.3.gem deleted file mode 100644 index 94a49b9cc3..0000000000 Binary files a/vendor/cache/actionview-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/actionview-6.0.1.gem b/vendor/cache/actionview-6.0.1.gem new file mode 100644 index 0000000000..7dab03d006 Binary files /dev/null and b/vendor/cache/actionview-6.0.1.gem differ diff --git a/vendor/cache/active_model_serializers-0.10.10.gem b/vendor/cache/active_model_serializers-0.10.10.gem new file mode 100644 index 0000000000..809ce0b4a4 Binary files /dev/null and b/vendor/cache/active_model_serializers-0.10.10.gem differ diff --git a/vendor/cache/active_model_serializers-0.10.7.gem b/vendor/cache/active_model_serializers-0.10.7.gem deleted file mode 100644 index 73dd47bbd3..0000000000 Binary files a/vendor/cache/active_model_serializers-0.10.7.gem and /dev/null differ diff --git a/vendor/cache/activejob-5.2.3.gem b/vendor/cache/activejob-5.2.3.gem deleted file mode 100644 index 2b75d32bbe..0000000000 Binary files a/vendor/cache/activejob-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/activejob-6.0.1.gem b/vendor/cache/activejob-6.0.1.gem new file mode 100644 index 0000000000..bbf8bfdc67 Binary files /dev/null and b/vendor/cache/activejob-6.0.1.gem differ diff --git a/vendor/cache/activemodel-5.2.3.gem b/vendor/cache/activemodel-5.2.3.gem deleted file mode 100644 index d0532a335c..0000000000 Binary files a/vendor/cache/activemodel-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/activemodel-6.0.1.gem b/vendor/cache/activemodel-6.0.1.gem new file mode 100644 index 0000000000..e419d18ce4 Binary files /dev/null and b/vendor/cache/activemodel-6.0.1.gem differ diff --git a/vendor/cache/activerecord-5.2.3.gem b/vendor/cache/activerecord-5.2.3.gem deleted file mode 100644 index 5bd118192f..0000000000 Binary files a/vendor/cache/activerecord-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/activerecord-6.0.1.gem b/vendor/cache/activerecord-6.0.1.gem new file mode 100644 index 0000000000..db89cf6fb9 Binary files /dev/null and b/vendor/cache/activerecord-6.0.1.gem differ diff --git a/vendor/cache/activestorage-5.2.3.gem b/vendor/cache/activestorage-5.2.3.gem deleted file mode 100644 index 0623cc8fa0..0000000000 Binary files a/vendor/cache/activestorage-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/activestorage-6.0.1.gem b/vendor/cache/activestorage-6.0.1.gem new file mode 100644 index 0000000000..172c633629 Binary files /dev/null and b/vendor/cache/activestorage-6.0.1.gem differ diff --git a/vendor/cache/activesupport-5.2.3.gem b/vendor/cache/activesupport-5.2.3.gem deleted file mode 100644 index acaae6e305..0000000000 Binary files a/vendor/cache/activesupport-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/activesupport-6.0.1.gem b/vendor/cache/activesupport-6.0.1.gem new file mode 100644 index 0000000000..3459bf560b Binary files /dev/null and b/vendor/cache/activesupport-6.0.1.gem differ diff --git a/vendor/cache/arel-9.0.0.gem b/vendor/cache/arel-9.0.0.gem deleted file mode 100644 index a2c51af406..0000000000 Binary files a/vendor/cache/arel-9.0.0.gem and /dev/null differ diff --git a/vendor/cache/ast-2.3.0.gem b/vendor/cache/ast-2.3.0.gem deleted file mode 100644 index 668d7a8b1e..0000000000 Binary files a/vendor/cache/ast-2.3.0.gem and /dev/null differ diff --git a/vendor/cache/ast-2.4.0.gem b/vendor/cache/ast-2.4.0.gem new file mode 100644 index 0000000000..b5db3ed6e2 Binary files /dev/null and b/vendor/cache/ast-2.4.0.gem differ diff --git a/vendor/cache/bullet-6.0.1.gem b/vendor/cache/bullet-6.0.1.gem deleted file mode 100644 index 925c6c5934..0000000000 Binary files a/vendor/cache/bullet-6.0.1.gem and /dev/null differ diff --git a/vendor/cache/bullet-6.0.2.gem b/vendor/cache/bullet-6.0.2.gem new file mode 100644 index 0000000000..f802d89936 Binary files /dev/null and b/vendor/cache/bullet-6.0.2.gem differ diff --git a/vendor/cache/erubi-1.8.0.gem b/vendor/cache/erubi-1.8.0.gem deleted file mode 100644 index 8f1c66ab57..0000000000 Binary files a/vendor/cache/erubi-1.8.0.gem and /dev/null differ diff --git a/vendor/cache/erubi-1.9.0.gem b/vendor/cache/erubi-1.9.0.gem new file mode 100644 index 0000000000..e169e65822 Binary files /dev/null and b/vendor/cache/erubi-1.9.0.gem differ diff --git a/vendor/cache/jaro_winkler-1.5.4.gem b/vendor/cache/jaro_winkler-1.5.4.gem new file mode 100644 index 0000000000..5ed9b9b49e Binary files /dev/null and b/vendor/cache/jaro_winkler-1.5.4.gem differ diff --git a/vendor/cache/jsonapi-renderer-0.2.0.gem b/vendor/cache/jsonapi-renderer-0.2.0.gem deleted file mode 100644 index 24a4c0420a..0000000000 Binary files a/vendor/cache/jsonapi-renderer-0.2.0.gem and /dev/null differ diff --git a/vendor/cache/jsonapi-renderer-0.2.2.gem b/vendor/cache/jsonapi-renderer-0.2.2.gem new file mode 100644 index 0000000000..9c8a5a9571 Binary files /dev/null and b/vendor/cache/jsonapi-renderer-0.2.2.gem differ diff --git a/vendor/cache/nio4r-2.4.0.gem b/vendor/cache/nio4r-2.4.0.gem deleted file mode 100644 index 16cf2894e2..0000000000 Binary files a/vendor/cache/nio4r-2.4.0.gem and /dev/null differ diff --git a/vendor/cache/nio4r-2.5.2.gem b/vendor/cache/nio4r-2.5.2.gem new file mode 100644 index 0000000000..4500941e68 Binary files /dev/null and b/vendor/cache/nio4r-2.5.2.gem differ diff --git a/vendor/cache/parallel-1.12.0.gem b/vendor/cache/parallel-1.12.0.gem deleted file mode 100644 index 85f670012c..0000000000 Binary files a/vendor/cache/parallel-1.12.0.gem and /dev/null differ diff --git a/vendor/cache/parallel-1.19.1.gem b/vendor/cache/parallel-1.19.1.gem new file mode 100644 index 0000000000..3d9358baeb Binary files /dev/null and b/vendor/cache/parallel-1.19.1.gem differ diff --git a/vendor/cache/parser-2.4.0.0.gem b/vendor/cache/parser-2.4.0.0.gem deleted file mode 100644 index 12f42c95eb..0000000000 Binary files a/vendor/cache/parser-2.4.0.0.gem and /dev/null differ diff --git a/vendor/cache/parser-2.6.5.0.gem b/vendor/cache/parser-2.6.5.0.gem new file mode 100644 index 0000000000..7c20cc748a Binary files /dev/null and b/vendor/cache/parser-2.6.5.0.gem differ diff --git a/vendor/cache/powerpack-0.1.1.gem b/vendor/cache/powerpack-0.1.1.gem deleted file mode 100644 index f7561fc090..0000000000 Binary files a/vendor/cache/powerpack-0.1.1.gem and /dev/null differ diff --git a/vendor/cache/rails-5.2.3.gem b/vendor/cache/rails-5.2.3.gem deleted file mode 100644 index 7b915743b8..0000000000 Binary files a/vendor/cache/rails-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/rails-6.0.1.gem b/vendor/cache/rails-6.0.1.gem new file mode 100644 index 0000000000..a71a8bed75 Binary files /dev/null and b/vendor/cache/rails-6.0.1.gem differ diff --git a/vendor/cache/rails-html-sanitizer-1.2.0.gem b/vendor/cache/rails-html-sanitizer-1.2.0.gem deleted file mode 100644 index 7dbcb226b2..0000000000 Binary files a/vendor/cache/rails-html-sanitizer-1.2.0.gem and /dev/null differ diff --git a/vendor/cache/rails-html-sanitizer-1.3.0.gem b/vendor/cache/rails-html-sanitizer-1.3.0.gem new file mode 100644 index 0000000000..bd8e8aad5b Binary files /dev/null and b/vendor/cache/rails-html-sanitizer-1.3.0.gem differ diff --git a/vendor/cache/rails-i18n-5.1.3.gem b/vendor/cache/rails-i18n-5.1.3.gem deleted file mode 100644 index 44e2b1e69a..0000000000 Binary files a/vendor/cache/rails-i18n-5.1.3.gem and /dev/null differ diff --git a/vendor/cache/rails-i18n-6.0.0.gem b/vendor/cache/rails-i18n-6.0.0.gem new file mode 100644 index 0000000000..7746e97b36 Binary files /dev/null and b/vendor/cache/rails-i18n-6.0.0.gem differ diff --git a/vendor/cache/railties-5.2.3.gem b/vendor/cache/railties-5.2.3.gem deleted file mode 100644 index 30d320defd..0000000000 Binary files a/vendor/cache/railties-5.2.3.gem and /dev/null differ diff --git a/vendor/cache/railties-6.0.1.gem b/vendor/cache/railties-6.0.1.gem new file mode 100644 index 0000000000..9b6021e7a0 Binary files /dev/null and b/vendor/cache/railties-6.0.1.gem differ diff --git a/vendor/cache/rainbow-2.2.2.gem b/vendor/cache/rainbow-2.2.2.gem deleted file mode 100644 index e5e00df09a..0000000000 Binary files a/vendor/cache/rainbow-2.2.2.gem and /dev/null differ diff --git a/vendor/cache/rainbow-3.0.0.gem b/vendor/cache/rainbow-3.0.0.gem new file mode 100644 index 0000000000..c53caf7afa Binary files /dev/null and b/vendor/cache/rainbow-3.0.0.gem differ diff --git a/vendor/cache/rspec-3.6.0.gem b/vendor/cache/rspec-3.6.0.gem deleted file mode 100644 index 967758bb82..0000000000 Binary files a/vendor/cache/rspec-3.6.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-3.9.0.gem b/vendor/cache/rspec-3.9.0.gem new file mode 100644 index 0000000000..d0cdbe3992 Binary files /dev/null and b/vendor/cache/rspec-3.9.0.gem differ diff --git a/vendor/cache/rspec-core-3.6.0.gem b/vendor/cache/rspec-core-3.6.0.gem deleted file mode 100644 index e6d56359ac..0000000000 Binary files a/vendor/cache/rspec-core-3.6.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-core-3.9.0.gem b/vendor/cache/rspec-core-3.9.0.gem new file mode 100644 index 0000000000..b3f59db0dc Binary files /dev/null and b/vendor/cache/rspec-core-3.9.0.gem differ diff --git a/vendor/cache/rspec-expectations-3.6.0.gem b/vendor/cache/rspec-expectations-3.6.0.gem deleted file mode 100644 index 31a4881cd3..0000000000 Binary files a/vendor/cache/rspec-expectations-3.6.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-expectations-3.9.0.gem b/vendor/cache/rspec-expectations-3.9.0.gem new file mode 100644 index 0000000000..6f8a08215a Binary files /dev/null and b/vendor/cache/rspec-expectations-3.9.0.gem differ diff --git a/vendor/cache/rspec-mocks-3.6.0.gem b/vendor/cache/rspec-mocks-3.6.0.gem deleted file mode 100644 index 11cff62742..0000000000 Binary files a/vendor/cache/rspec-mocks-3.6.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-mocks-3.9.0.gem b/vendor/cache/rspec-mocks-3.9.0.gem new file mode 100644 index 0000000000..75f81ceab8 Binary files /dev/null and b/vendor/cache/rspec-mocks-3.9.0.gem differ diff --git a/vendor/cache/rspec-rails-3.6.1.gem b/vendor/cache/rspec-rails-3.6.1.gem deleted file mode 100644 index 25d41302cd..0000000000 Binary files a/vendor/cache/rspec-rails-3.6.1.gem and /dev/null differ diff --git a/vendor/cache/rspec-rails-4.0.0.beta3.gem b/vendor/cache/rspec-rails-4.0.0.beta3.gem new file mode 100644 index 0000000000..ba56d5bdb9 Binary files /dev/null and b/vendor/cache/rspec-rails-4.0.0.beta3.gem differ diff --git a/vendor/cache/rspec-support-3.6.0.gem b/vendor/cache/rspec-support-3.6.0.gem deleted file mode 100644 index b565017b05..0000000000 Binary files a/vendor/cache/rspec-support-3.6.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-support-3.9.0.gem b/vendor/cache/rspec-support-3.9.0.gem new file mode 100644 index 0000000000..08a21175a2 Binary files /dev/null and b/vendor/cache/rspec-support-3.9.0.gem differ diff --git a/vendor/cache/rubocop-0.49.1.gem b/vendor/cache/rubocop-0.49.1.gem deleted file mode 100644 index fd5a4ab6e6..0000000000 Binary files a/vendor/cache/rubocop-0.49.1.gem and /dev/null differ diff --git a/vendor/cache/rubocop-0.76.0.gem b/vendor/cache/rubocop-0.76.0.gem new file mode 100644 index 0000000000..75b692084a Binary files /dev/null and b/vendor/cache/rubocop-0.76.0.gem differ diff --git a/vendor/cache/rubocop-performance-1.5.1.gem b/vendor/cache/rubocop-performance-1.5.1.gem new file mode 100644 index 0000000000..764c68cb34 Binary files /dev/null and b/vendor/cache/rubocop-performance-1.5.1.gem differ diff --git a/vendor/cache/rubocop-rails-2.3.2.gem b/vendor/cache/rubocop-rails-2.3.2.gem new file mode 100644 index 0000000000..9546e6269a Binary files /dev/null and b/vendor/cache/rubocop-rails-2.3.2.gem differ diff --git a/vendor/cache/rubocop-rspec-1.36.0.gem b/vendor/cache/rubocop-rspec-1.36.0.gem new file mode 100644 index 0000000000..decab71b61 Binary files /dev/null and b/vendor/cache/rubocop-rspec-1.36.0.gem differ diff --git a/vendor/cache/ruby-progressbar-1.10.1.gem b/vendor/cache/ruby-progressbar-1.10.1.gem new file mode 100644 index 0000000000..519968f235 Binary files /dev/null and b/vendor/cache/ruby-progressbar-1.10.1.gem differ diff --git a/vendor/cache/ruby-progressbar-1.8.1.gem b/vendor/cache/ruby-progressbar-1.8.1.gem deleted file mode 100644 index 6f8065a1e5..0000000000 Binary files a/vendor/cache/ruby-progressbar-1.8.1.gem and /dev/null differ diff --git a/vendor/cache/sass-rails-5.0.6.gem b/vendor/cache/sass-rails-5.0.6.gem deleted file mode 100644 index 7968639b1c..0000000000 Binary files a/vendor/cache/sass-rails-5.0.6.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 0000000000..89aa8aef32 Binary files /dev/null and b/vendor/cache/sass-rails-6.0.0.gem differ diff --git a/vendor/cache/sassc-2.2.1.gem b/vendor/cache/sassc-2.2.1.gem new file mode 100644 index 0000000000..b4c397eddc Binary files /dev/null and b/vendor/cache/sassc-2.2.1.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 0000000000..a599113ac5 Binary files /dev/null and b/vendor/cache/sassc-rails-2.1.2.gem differ diff --git a/vendor/cache/unicode-display_width-1.3.0.gem b/vendor/cache/unicode-display_width-1.3.0.gem deleted file mode 100644 index 6f95e447d7..0000000000 Binary files a/vendor/cache/unicode-display_width-1.3.0.gem and /dev/null differ diff --git a/vendor/cache/unicode-display_width-1.6.0.gem b/vendor/cache/unicode-display_width-1.6.0.gem new file mode 100644 index 0000000000..e84e43f3a2 Binary files /dev/null and b/vendor/cache/unicode-display_width-1.6.0.gem differ diff --git a/vendor/cache/uniform_notifier-1.12.1.gem b/vendor/cache/uniform_notifier-1.12.1.gem deleted file mode 100644 index a11e4108c7..0000000000 Binary files a/vendor/cache/uniform_notifier-1.12.1.gem and /dev/null differ diff --git a/vendor/cache/uniform_notifier-1.13.0.gem b/vendor/cache/uniform_notifier-1.13.0.gem new file mode 100644 index 0000000000..9291b0718b Binary files /dev/null and b/vendor/cache/uniform_notifier-1.13.0.gem differ diff --git a/vendor/cache/zeitwerk-2.2.1.gem b/vendor/cache/zeitwerk-2.2.1.gem new file mode 100644 index 0000000000..f0f71777ed Binary files /dev/null and b/vendor/cache/zeitwerk-2.2.1.gem differ