Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

[WIP] Upgrade to Rails 6.0.1 #2472

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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:
Expand Down Expand Up @@ -45,7 +62,7 @@ Rails/UnknownEnv:
- staging
- production

Style/FileName:
Naming/FileName:
Exclude:
- 'Gemfile'
- 'Guardfile'
Expand Down
Empty file added .rubocop_todo.yml
Empty file.
17 changes: 10 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Loading