Merge pull request #2 from HarvestProfit/fix-up-for-jd-demo

Upgrade to Rails 6.1

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.5-node
+      - image: circleci/ruby:2.7-node
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3

.gitignore

@@ -27,3 +27,4 @@
 yarn-debug.log*
 .yarn-integrity
 .DS_Store
+.env

.ruby-version

@@ -1 +1 @@
-2.5.1
+2.7.2

Gemfile

@@ -1,69 +1,35 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.5.1'
+ruby '2.7.2'
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.0'
-# Use postgresql as the database for Active Record
-gem 'pg', '>= 0.18', '< 2.0'
-# Use Puma as the app server
-gem 'puma', '~> 3.11'
-# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-# gem 'jbuilder', '~> 2.5'
-# Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 4.0'
-# Use ActiveModel has_secure_password
-gem 'bcrypt', '~> 3.1.7'
-# JWTs for authentication
-gem 'jwt'
-# Acts as list to handle sorting
-gem 'acts_as_list'
+gem 'rails', '~> 6.1'
 
-# Use ActiveStorage variant
-# gem 'mini_magick', '~> 4.8'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
-# Reduces boot times through caching; required in config/boot.rb
+gem 'active_model_serializers'
+gem 'acts_as_list'
+gem 'bcrypt', '~> 3.1.7'
 gem 'bootsnap', '>= 1.1.0', require: false
-
-# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
+gem 'jwt'
+gem 'pg', '>= 0.18', '< 2.0'
+gem 'puma', '~> 3.11'
 gem 'rack-cors'
-
-# Allows us to serialize models before being processed by the API
-gem 'active_model_serializers'
+gem 'webpacker'
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
-  # Use codecov to report coverage
+  gem 'byebug'
   gem 'codecov', require: false
-  # Use factory bot for all model mocks
   gem 'factory_bot_rails'
-  # Use rspec for all tests
-  gem 'rspec-rails'
-  # Format test output for CircleCI
   gem 'rspec_junit_formatter'
-  # Use simplecov to report coverage
+  gem 'rspec-rails'
   gem 'simplecov', require: false
-
 end
 
 group :development do
   gem 'listen', '>= 3.0.5', '< 3.2'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
 group :production do
   gem 'aws-sdk-s3', require: false
 end
-
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]