Merge pull request #3456 from 3scale/THREESCALE-7405-rails-6

THREESCALE-7405: Update Rails to 6.0

.codeclimate.yml

@@ -35,7 +35,6 @@ exclude_patterns:
   - "app/javascript"
   - "assets/bundles/*.js"
   - "bin/webpack*"
-  - "lib/action_dispatch/rails5_ssl.rb"
   - "lib/developer_portal/app/assets/stylesheets/**/*"
   - "lib/developer_portal/app/views/developer_portal/css/*"
   - "lib/developer_portal/app/views/developer_portal/javascripts/*"

Gemfile

@@ -12,8 +12,7 @@ gem 'aws-sdk-rails', '~> 3'
 gem 'aws-sdk-s3', '~> 1'
 
 gem 'dotenv-rails', '~> 2.7'
-gem 'rails', '~> 5.2.8'
-gem 'globalid', '~> 1.0.1' # remove line after we stop supporting Ruby 2.4
+gem 'rails', '~> 6.0'
 
 # Locking mail to 2.7.x, as 2.8 has a regression related to `enable_starttls_auto` setting:
 # https://github.com/mikel/mail/blob/2-8-stable/CHANGELOG.rdoc#version-281-unreleased-
@@ -33,10 +32,10 @@ gem 'strong_migrations', '~> 0.6.8'
 group :assets do
   gem 'coffee-rails', '~> 5.0'
   gem 'non-stupid-digest-assets', '~> 1.0'
-  gem 'sprockets-rails', '3.2.2' # remove version after we stop supporting Ruby 2.4
+  gem 'sprockets-rails'
 end
 
-gem 'sass-rails', '~> 5.0'
+gem 'sass-rails', '~> 5.0.8'
 
 gem 'bcrypt', '~> 3.1.7'
 gem 'oauth2', '~> 1.4'
@@ -77,15 +76,14 @@ gem 'formtastic', '~> 4.0'
 gem 'htmlentities', '~>4.3', '>= 4.3.4'
 # TODO: Not actively maintained https://github.com/activeadmin/inherited_resources#notice replace with respond_with and fix things the rails way
 gem 'inherited_resources', '~> 1.12.0'
-gem 'has_scope', '~> 0.7.2' # remove line after we stop supporting Ruby 2.4
 gem 'json', '~> 2.3.0'
 
 gem 'mysql2', '~> 0.5.3'
 
 gem '3scale_client', '~> 2.11', require: false
 gem 'analytics-ruby', require: false
 
-gem 'dalli', '~> 2.7' # remove version once we stop supporting ruby 2.4
+gem 'dalli'
 gem 'faraday', '~> 0.15.3'
 gem 'faraday_middleware', '~> 0.13.1'
 gem 'mimemagic', '~> 0.3.10'
@@ -95,8 +93,7 @@ gem 'redlock'
 
 gem 'acts-as-taggable-on', '~> 8.0'
 gem 'baby_squeel', '~> 1.4.3'
-gem 'ransack', '2.4.1' # we can remove line when stop using ruby 2.4
-gem 'browser', '~> 5.0.0' # we can update to lts when we stop using ruby 2.4
+gem 'browser'
 gem 'diff-lcs', '~> 1.2'
 gem 'hiredis', '~> 0.6.3'
 gem 'httpclient', github: '3scale/httpclient', branch: 'ssl-env-cert'
@@ -149,7 +146,7 @@ gem 'compass-rails', '~> 3.0.2'
 
 gem 'after_commit_queue', '~> 1.1.0'
 gem 'state_machines', '~> 0.5.0'
-gem 'state_machines-activerecord', '~> 0.5.0'
+gem 'state_machines-activerecord', '~> 0.8'
 
 # for liquid docs on-fly generation
 gem 'commonmarker', '~> 0.23.9'
@@ -161,7 +158,7 @@ gem 'html-pipeline'
 gem 'ruby-openid'
 gem 'slim-rails', '~> 3.2'
 
-gem 'draper', '~> 3.0'
+gem 'draper', '~> 3.1'
 
 group :development do
   gem 'listen'
@@ -188,7 +185,7 @@ group :test do
   # To remove once migrated all functional tests
   gem 'codecov', :require => false
   gem 'rack-no_animations', '~> 1.0.3'
-  gem 'rails-controller-testing'
+  gem 'rails-controller-testing', '~> 1.0.4'
   gem 'simplecov', '~> 0.21.2', require: false
 
   gem 'capybara', '~>3.35.3', source: 'https://rubygems.org'
@@ -198,7 +195,7 @@ group :test do
   gem 'cucumber', '~> 7.0'
   gem 'cucumber-rails', '~> 2.4.0', require: false
   gem 'email_spec', require: false
-  gem 'fakefs', '~>0.18.0', require: 'fakefs/safe'
+  gem 'fakefs', require: 'fakefs/safe'
   gem 'launchy'
   gem 'mechanize'
   gem 'selenium-webdriver', '~> 3.142', require: false
@@ -239,7 +236,7 @@ group :test do
 end
 
 group :development, :test do
-  gem 'bootsnap', '~> 1.4'
+  gem 'bootsnap', '~> 1.16'
   gem 'bullet', '~> 6.1.5'
   gem 'colorize'
   gem 'factory_bot_rails', '~> 6.2'
@@ -265,11 +262,10 @@ gem 'unicorn', require: false, group: %i[production]
 # NOTE: Use ENV['DB'] only to install oracle dependencies
 group :oracle do
   oracle = -> { (ENV['ORACLE'] == '1') || ENV.fetch('DATABASE_URL', ENV['DB'])&.start_with?('oracle') }
-  gem 'activerecord-oracle_enhanced-adapter', '~> 5.2.0', install_if: oracle
+  gem 'activerecord-oracle_enhanced-adapter', '~> 6.0', install_if: oracle
   gem 'ruby-oci8', require: false, install_if: oracle
 end
 
 gem 'kubeclient'
-gem 'jsonpath', '1.0.5' # remove line after we stop supporting ruby 2.4
 
 gem 'pg', '~> 0.21.0'