Merge pull request #304 from openstax/rails6

Rails 6.1 update

.github/workflows/migrations.yml

@@ -65,7 +65,7 @@ jobs:
           bundle install --jobs 4 --retry 3
           bundle exec rake db:create db:schema:load db:seed --trace
           bundle exec rails runner '10.times { FactoryBot.create :exercise }'
-          git checkout -
+          git checkout --force -
 
       # Retrieve gem cache for PR merge commit
       - uses: actions/cache@v2

.gitignore

@@ -50,30 +50,32 @@ bower.json
 # Ignore Byebug command history file.
 .byebug_history
 
-# Ignore node_modules
-node_modules/
-
-# Ignore precompiled javascript packs
+# Ignore public precompiled assets, packs, uploaded files, exports and test files
+/public/assets
+/public/uploads
+/public/exports
 /public/packs
 /public/packs-test
-/public/assets
-
-# Ignore yarn files
-/yarn-error.log
-yarn-debug.log*
-.yarn-integrity
+/public/test
 
 # Ignore uploaded files in development
 /storage/*
 !/storage/.keep
-/public/uploads
 
-# Ignore attached files in development
-/public/attachments
+# Ignore node_modules
+node_modules/
+
+# Ignore yarn files
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
 
 # Ignore Cucumber and RSpec failure information
 cucumber_rerun.txt
-rspec.failures
+.rspec_last_failures
+
+# Ignore brakeman reports
+brakeman.html
 
 # Ignore webdrivers lock file
 .webdrivers_update

Gemfile

@@ -9,7 +9,7 @@ git_source(:github) do |repo_name|
 end
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.3'
+gem 'rails'
 
 # Bootstrap
 gem 'bootstrap-sass'
@@ -23,9 +23,6 @@ gem 'compass-rails'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2.2'
-
 gem 'mini_racer'
 
 # Use jquery as the JavaScript library
@@ -52,6 +49,12 @@ gem 'rinku'
 # Sanitizes user content
 gem 'sanitize'
 
+# ActiveStorage variants
+gem 'image_processing'
+
+# ActiveStorage S3 support
+gem 'aws-sdk-s3'
+
 # Utilities for OpenStax websites
 gem 'openstax_utilities'
 
@@ -79,23 +82,17 @@ gem 'fine_print'
 # Keyword search
 gem 'keyword_search'
 
-# File uploads
+# File uploads (old)
 gem 'remotipart'
 gem 'carrierwave'
 gem 'mimemagic'
 
-# Image editing
-gem 'mini_magick'
-
 # Read Excel xlsx spreadsheet files
 gem 'roo'
 
 # Embedded JavaScript templates
 gem 'ejs'
 
-# Embedded CoffeeScript templates
-gem 'eco'
-
 # Object cloning
 gem 'deep_cloneable'
 
@@ -106,7 +103,7 @@ gem 'sortability'
 gem 'acts_as_votable'
 
 # Real time application monitoring
-gem 'scout_apm', '~> 3.0.pre28'
+gem 'scout_apm'
 
 # PostgreSQL database
 gem 'pg'
@@ -141,7 +138,7 @@ gem 'oj'
 gem 'oj_mimic_json'
 
 # Key-value store for caching
-gem 'redis-rails'
+gem 'redis'
 
 # Respond to ELB healthchecks in /ping and /ping/
 gem 'openstax_healthcheck'
@@ -184,6 +181,9 @@ group :development, :test do
 end
 
 group :development do
+  # Listen for file changes in development
+  gem 'listen'
+
   # Automated security checks
   gem 'brakeman'
 
@@ -200,9 +200,6 @@ group :development do
   gem 'rails-erd'
   gem 'railroady'
 
-  # CoffeeScript source maps
-  gem 'coffee-rails-source-maps'
-
   # Access an IRB console on exception pages or by using <%= console %> in views
   gem 'web-console'
 end
@@ -226,9 +223,6 @@ group :production do
   gem 'aws-sdk-ssm', require: false
   gem 'aws-sdk-secretsmanager', require: false
 
-  # AWS SES
-  gem 'aws-ses', '~> 0.6.0', require: 'aws/ses'
-
   # Fog AWS
   gem 'fog-aws'