Upgrade to Rails 6

Author: Vidas P

.rubocop.yml

@@ -24,8 +24,6 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 Lint/UnderscorePrefixedVariableName:
   Enabled: false
-Style/BracesAroundHashParameters:
-  Enabled: false
 Metrics/BlockLength:
   Enabled: false
 Style/BlockDelimiters:

CHANGELOG.md

@@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [current]
 ### Fixed
-- Update puma (CVE-2020-5249)
-- Update rails, grape (CVE-2020-5267)
+- Update puma (CVE-2020-5249).
+- Update rails, grape (CVE-2020-5267).
+
+### Changed
+- Upgrade to Rails 6.
 
 
 ## [0.9.7] - 2020-02-28

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.3-slim
+FROM ruby:2.6.6-slim
 
 COPY docker/scripts/prepare /scripts/
 RUN /scripts/prepare

Gemfile

@@ -2,23 +2,6 @@ source 'https://rubygems.org'
 
 ruby '>=2.6.0'
 
-# Ensure github repositories are fetched using HTTPS
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
-  "https://github.com/#{repo_name}.git"
-end if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('2')
-
-# Introduces a scope for gem loading based on a condition
-def if_true(condition)
-  if condition
-    yield
-  else
-    # When not including the gems, we still want our Gemfile.lock
-    # to include them, so we scope them to an unsupported platform.
-    platform :ruby_18, &proc
-  end
-end
-
 # Optional libraries.  To conserve RAM, comment out any that you don't need,
 # then run `bundle` and commit the updated Gemfile and Gemfile.lock.
 # TODO: update
@@ -43,11 +26,10 @@ gem 'omniauth-37signals' # BasecampAgent
 gem 'omniauth-wunderlist'
 
 gem 'ace-rails-ap', '~> 4.2'
-gem 'bootsnap', '>= 1.1.0', require: false
+gem 'bootsnap', '>= 1.4.6', require: false
 gem 'execjs', '~> 2.7.0'
 gem 'mini_racer', '~> 0.2.8'
-gem 'bootstrap', '~> 4.3.1'
-gem 'bootstrap-kaminari-views', '~> 0.0.5'
+gem 'bootstrap', '~> 4.4.1'
 gem 'daemons', '~> 1.2.6'
 gem 'delayed_job', '~> 4.1.8'
 gem 'delayed_job_active_record', '~> 4.1.4'
@@ -57,83 +39,77 @@ gem 'dotenv', '~> 2.5.0'
 gem 'faraday', '~> 0.9'
 gem 'faraday_middleware', '~> 0.12.2'
 gem 'feedjira', '~> 2.2'
-gem 'font-awesome-sass', '~> 5.6.1'
+gem 'font-awesome-sass', '~> 5.12.0'
 gem 'httparty', '~> 0.16'
 gem 'jquery-rails', '~> 4.3.5'
-gem 'json', '~> 2.2.0'
+gem 'json', '~> 2.3.0'
 gem 'jsonpath', '~> 1.0.1'
 gem 'kaminari', '~> 1.1.1'
 gem 'kramdown', '~> 2.1.0'
 gem 'liquid', '~> 4.0.3'
-gem 'loofah', '~> 2.3.1'
+gem 'loofah', '~> 2.5.0'
 gem 'mini_magick', '~> 4.9.5'
 gem 'nokogiri', '~> 1.10.8'
 gem 'omniauth', '~> 1.9.0'
 gem 'rack-timeout', '~> 0.5.1'
-gem 'rails', '~> 5.2.4.2'
-gem 'rails-html-sanitizer', '~> 1.0.4'
+gem 'rails', '~> 6.0.2'
+gem 'rails-html-sanitizer', '~> 1.3.0'
 # TODO: Removing coffee-rails breaks deployment on heroku, investigate.
 gem 'coffee-rails', '~> 4.2.2'
 # TODO: update
 gem 'rufus-scheduler', '~> 3.4.2', require: false
 gem 'sass-rails', '~> 5.0'
+gem 'sassc', '~>2.3.0'
 # TODO: update
 gem 'select2-rails', '~> 3.5.4'
 gem 'source-sans-pro-rails', '~> 0.7.0'
 gem 'spectrum-rails', '~> 1.8.0'
 gem 'sprockets', '~> 3.7.2'
 # TODO: update
-gem 'typhoeus', '~> 0.6.3'
+gem 'typhoeus', '~> 1.3.1'
 gem 'uglifier', '~> 4.1.18'
 gem 'jquery-datatables', '~> 1.10.19'
-gem 'grape', '~> 1.3.1'
+gem 'grape', '~> 1.3.2'
 gem 'grape-entity', '~> 0.8.0'
 gem 'jwt', '~> 2.2.1'
 
 group :development do
-  gem 'foreman', '~> 0.86.0'
-  gem 'bullet', '~> 6.0.1'
-  gem 'sqlite3', '~> 1.4.1'
-  gem 'better_errors', '~> 2.5.1'
+  gem 'foreman', '~> 0.87.1'
+  gem 'bullet', '~> 6.1.0'
+  gem 'sqlite3', '~> 1.4.2'
+  gem 'better_errors', '~> 2.7.0'
   gem 'binding_of_caller', '~> 0.8.0'
-  gem 'guard', '~> 2.16.1'
+  gem 'guard', '~> 2.16.2'
   gem 'guard-livereload', '~> 2.5.2'
   gem 'guard-rspec', '~> 4.7.3'
-  gem 'letter_opener_web', '~> 1.3.4'
-  gem 'overcommit', '~> 0.51.0'
+  gem 'letter_opener_web', '~> 1.4.0'
+  gem 'overcommit', '~> 0.53.0'
   gem 'rack-livereload', '~> 0.3.17'
-  gem 'rails_best_practices', '~> 1.19.4'
-  gem 'reek', '~> 5.4.0'
-  gem 'rubocop', '~> 0.76.0'
+  gem 'rails_best_practices', '~> 1.20.0'
+  gem 'reek', '~> 6.0.0'
+  gem 'rubocop', '~> 0.82.0'
   gem 'web-console', '~> 3.7.0'
 
-  if_true(ENV['SPRING']) do
-    gem 'spring-commands-rspec', '~> 1.0.4'
-    gem 'spring', '~> 2.0.2'
-    gem 'spring-watcher-listen', '~> 2.0.1'
-  end
-
   group :test do
-    gem 'capybara', '~> 3.29.0'
-    gem 'capybara-screenshot', '~> 1.0.23'
+    gem 'capybara', '~> 3.32.1'
+    gem 'capybara-screenshot', '~> 1.0.24'
     gem 'capybara-select2', require: false
     gem 'codecov', '~> 0.1.16', require: false
     gem 'delorean', '~> 2.1.0'
-    gem 'parallel_split_test', '~> 0.7.0'
-    gem 'pry-byebug', '~> 3.7.0'
+    gem 'pry-byebug', '~> 3.9.0'
     gem 'pry-rails', '~> 0.3.9'
     gem 'rails-controller-testing', '~> 1.0.4'
     # TODO: update
     gem 'rr', '~> 1.1.2'
     gem 'rspec', '~> 3.9.0'
-    gem 'rspec-rails', '~> 3.9.0'
+    gem 'rspec-rails', '~> 4.0.0'
     gem 'rspec-collection_matchers', '~> 1.2.0'
     gem 'rspec-html-matchers', '~> 0.9.2'
     gem 'rspec_junit_formatter', '~> 0.4.1'
-    gem 'selenium-webdriver', '~> 3.142.6'
-    gem 'shoulda-matchers', '~> 4.1.2'
-    gem 'vcr', '~> 5.0.0'
-    gem 'webmock', '~> 3.7.6'
+    gem 'selenium-webdriver', '~> 3.142.7'
+    gem 'shoulda-matchers', '~> 4.3.0'
+    gem 'vcr', '~> 5.1.0'
+    gem 'webmock', '~> 3.8.3'
   end
 end
 
@@ -146,6 +122,4 @@ ENV['DATABASE_ADAPTER'] ||=
     'sqlite3'
   end
 
-if_true(ENV['DATABASE_ADAPTER'].strip == 'postgresql') do
-  gem 'pg', '~> 1.1.4'
-end
+gem 'pg', '~> 1.2.3'