Merge pull request #31 from CruGlobal/rails60

Upgrade to Rails 6

.gitignore

@@ -7,20 +7,27 @@
 # Ignore bundler config.
 /.bundle
 
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+/db/*.sqlite3-*
+
 # Ignore all logfiles and tempfiles.
 /spec/examples.txt
 /log/*
 /tmp/*
 !/log/.keep
 !/tmp/.keep
 
-# Ignore uploaded files in development
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/
+!/tmp/pids/.keep
+
+# Ignore uploaded files in development.
 /storage/*
 !/storage/.keep
 
-/node_modules
-/yarn-error.log
-
 /public/assets
 .byebug_history
 

Gemfile

@@ -3,48 +3,87 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby "2.6.6"
 
-gem "rails", "~> 5.2.3"
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem "rails", "~> 6.0.3"
+# Use sqlite3 as the database for Active Record
+# gem 'sqlite3', '~> 1.4'
+# Use Puma as the app server
+gem "puma", "~> 4.1"
+# Use SCSS for stylesheets
+# gem 'sass-rails', '>= 6'
+# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
+# gem 'webpacker', '~> 4.0'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+# gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+# gem 'jbuilder', '~> 2.7'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use Active Model has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use Active Storage variant
+# gem 'image_processing', '~> 1.2'
+
+# Reduces boot times through caching; required in config/boot.rb
+gem "bootsnap", ">= 1.4.2", require: false
+
+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]
+end
+
+group :development do
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem "web-console", ">= 3.3.0"
+  gem "listen", "~> 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 :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem "capybara", ">= 2.15"
+  gem "selenium-webdriver"
+  # Easy installation and use of web drivers to run system tests with browsers
+  gem "webdrivers"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
 gem "active_model_serializers"
-gem "puma", "~> 3.11"
-gem "bootsnap", ">= 1.1.0", require: false
-gem "newrelic_rpm"
-gem "versionist"
-gem "rack-cors", require: "rack/cors"
-gem "rollbar"
-gem "syslog-logger"
+gem "amazing_print"
+gem "cru-auth-lib", "~> 0.1.0"
+gem "ddtrace"
+gem "dogstatsd-ruby"
+gem "lograge"
 gem "oj"
 gem "oj_mimic_json"
-gem "ddtrace"
-gem "awesome_print"
-
-# rubyCAS
+gem "ougai", "~> 1.7"
+gem "rack-cors", require: "rack/cors"
+gem "rollbar"
 gem "rubycas-client-rails"
-
-gem "cru-auth-lib", "~> 0.1.0"
-
+gem "versionist"
 gem "xml-simple", require: "xmlsimple"
 
 group :development, :test do
   gem "brakeman"
   gem "bundler-audit"
   gem "dotenv-rails"
-  gem "guard-rubocop"
   gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry-rails"
   gem "rspec-rails"
-  gem "spring"
   gem "standard"
-  gem "pry-rails"
 end
 
 group :test do
-  gem "webmock"
+  gem "coveralls", require: false
+  gem "factory_bot_rails"
+  gem "fakeredis", require: "fakeredis/rspec"
   gem "simplecov", require: false
-  gem "factory_girl_rails"
   gem "shoulda", require: false
-  gem "rubocop"
-  gem "fakeredis", require: "fakeredis/rspec"
-  gem "coveralls", require: false
+  gem "webmock"
 end
-gem "lograge"
-gem "ougai", "~> 1.7"
-gem "dogstatsd-ruby"