DefactoSoftware · fatboypunk · Mar 4, 2020 · Mar 6, 2020
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1,2 @@
+ruby 2.6.0
+nodejs 13.7.0
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,6 @@ ruby '2.6.0'
 gem 'autoprefixer-rails'
 gem 'bourbon', '~> 4.2.0'
 gem 'chronic'
-gem 'coffee-rails', '~> 4.1.0'
 gem 'delayed_job_active_record'
 gem 'flutie'
 gem 'high_voltage'
@@ -19,16 +18,15 @@ gem 'normalize-rails', '~> 3.0.0'
 gem 'pg'
 gem 'puma'
 gem 'rack-canonical-host'
-gem 'rails', '~> 4.2'
+gem 'rails', '~> 5.2'
 gem 'recipient_interceptor'
 gem 'sass-rails', '~> 5.0'
-gem 'simple_form'
+gem 'simple_form', '~> 5'
 gem 'telegram-bot-ruby'
 gem 'title'
 gem 'uglifier'
 
 group :development do
-  gem 'quiet_assets'
   gem 'refills'
   gem 'spring'
   gem 'spring-commands-rspec'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,43 +1,50 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
+    actioncable (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11.1)
-      actionview (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.4.1)
+      actionview (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.1)
-      activesupport (= 4.2.11.1)
+    actionview (5.2.4.1)
+      activesupport (= 5.2.4.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      builder (~> 3.1)
-    activerecord (4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      arel (~> 6.0)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    activejob (5.2.4.1)
+      activesupport (= 5.2.4.1)
+      globalid (>= 0.3.6)
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activerecord (5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      arel (>= 9.0)
+    activestorage (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    arel (6.0.4)
+    arel (9.0.0)
     autoprefixer-rails (7.1.1)
       execjs
     awesome_print (1.8.0)
@@ -71,13 +78,6 @@ GEM
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    coffee-rails (4.1.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -98,7 +98,7 @@ GEM
       dotenv (= 2.7.5)
       railties (>= 3.2, < 6.1)
     equalizer (0.0.11)
-    erubis (2.7.0)
+    erubi (1.9.0)
     execjs (2.7.0)
     factory_girl (4.9.0)
       activesupport (>= 3.0.0)
@@ -116,25 +116,28 @@ GEM
       activesupport (>= 4.2.0)
     hashdiff (1.0.1)
     high_voltage (3.1.2)
-    i18n (0.9.5)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inflecto (0.0.2)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.2.0)
+    json (2.3.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    leaflet-rails (1.0.3)
+    leaflet-rails (1.5.1)
       rails (>= 4.2.0)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     method_source (0.9.2)
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -144,7 +147,7 @@ GEM
       sass (>= 3.3)
     newrelic_rpm (6.9.0.363)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     normalize-rails (3.0.3)
     pg (0.20.0)
@@ -159,39 +162,37 @@ GEM
     public_suffix (4.0.3)
     puma (4.3.3)
       nio4r (~> 2.0)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
-    rack (1.6.13)
+    rack (2.2.2)
     rack-canonical-host (0.2.3)
       addressable (> 0, < 3)
       rack (>= 1.0.0, < 3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
     rack-timeout (0.5.1)
-    rails (4.2.11.1)
-      actionmailer (= 4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activerecord (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rails (5.2.4.1)
+      actioncable (= 5.2.4.1)
+      actionmailer (= 5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      activestorage (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      bundler (>= 1.3.0)
+      railties (= 5.2.4.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    railties (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rake (13.0.1)
     recipient_interceptor (0.2.0)
       mail
@@ -224,9 +225,9 @@ GEM
       tilt (>= 1.1, < 3)
     shoulda-matchers (4.1.2)
       activesupport (>= 4.2.0)
-    simple_form (4.0.0)
-      actionpack (> 4)
-      activemodel (> 4)
+    simple_form (5.0.2)
+      actionpack (>= 5.0)
+      activemodel (>= 5.0)
     simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -271,6 +272,9 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -285,7 +289,6 @@ DEPENDENCIES
   bundler-audit
   capybara-webkit
   chronic
-  coffee-rails (~> 4.1.0)
   database_cleaner
   delayed_job_active_record
   dotenv-rails
@@ -303,16 +306,15 @@ DEPENDENCIES
   pry-byebug
   pry-rails
   puma
-  quiet_assets
   rack-canonical-host
   rack-timeout
-  rails (~> 4.2)
+  rails (~> 5.2)
   recipient_interceptor
   refills
   rspec-rails (~> 3.9.0)
   sass-rails (~> 5.0)
   shoulda-matchers
-  simple_form
+  simple_form (~> 5)
   simplecov
   spring
   spring-commands-rspec

diff --git a/config/application.rb b/config/application.rb
@@ -22,7 +22,6 @@ class Application < Rails::Application
       generate.view_specs false
     end
     config.action_controller.action_on_unpermitted_parameters = :raise
-    config.active_record.raise_in_transactional_callbacks = true
     config.active_job.queue_adapter = :delayed_job
   end
 end
diff --git a/config/initializers/disable_xml_params.rb b/config/initializers/disable_xml_params.rb
@@ -1 +1 @@
-ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)
+ActionDispatch::Request.parameter_parsers = ActionDispatch::Request.parameter_parsers.except(:json)
diff --git a/db/migrate/20160415083306_create_delayed_jobs.rb b/db/migrate/20160415083306_create_delayed_jobs.rb
@@ -1,4 +1,4 @@
-class CreateDelayedJobs < ActiveRecord::Migration
+class CreateDelayedJobs < ActiveRecord::Migration[4.2]
   def self.up
     create_table :delayed_jobs, force: true do |table|
       table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue

diff --git a/db/migrate/20160415085306_create_games.rb b/db/migrate/20160415085306_create_games.rb
@@ -1,4 +1,4 @@
-class CreateGames < ActiveRecord::Migration
+class CreateGames < ActiveRecord::Migration[4.2]
   def change
     create_table :games do |t|
       t.string :name

diff --git a/db/migrate/20160415133350_enable_uuid_extension.rb b/db/migrate/20160415133350_enable_uuid_extension.rb
@@ -1,4 +1,4 @@
-class EnableUuidExtension < ActiveRecord::Migration
+class EnableUuidExtension < ActiveRecord::Migration[4.2]
   def change
     enable_extension 'uuid-ossp'
   end

diff --git a/db/migrate/20160415135322_add_uuid_to_games.rb b/db/migrate/20160415135322_add_uuid_to_games.rb
@@ -1,4 +1,4 @@
-class AddUuidToGames < ActiveRecord::Migration
+class AddUuidToGames < ActiveRecord::Migration[4.2]
   def change
     add_column :games, :uuid, :uuid, default: 'uuid_generate_v4()', index: true
   end

diff --git a/db/migrate/20160419143856_create_players.rb b/db/migrate/20160419143856_create_players.rb
@@ -1,4 +1,4 @@
-class CreatePlayers < ActiveRecord::Migration
+class CreatePlayers < ActiveRecord::Migration[4.2]
   def change
     create_table :players do |t|
       t.string :first_name

diff --git a/db/migrate/20160419150956_create_attendances.rb b/db/migrate/20160419150956_create_attendances.rb
@@ -1,4 +1,4 @@
-class CreateAttendances < ActiveRecord::Migration
+class CreateAttendances < ActiveRecord::Migration[4.2]
   def change
     create_table :attendances do |t|
       t.integer :game_id

diff --git a/db/migrate/20160420052649_set_default_for_required_players.rb b/db/migrate/20160420052649_set_default_for_required_players.rb
@@ -1,4 +1,4 @@
-class SetDefaultForRequiredPlayers < ActiveRecord::Migration
+class SetDefaultForRequiredPlayers < ActiveRecord::Migration[4.2]
   def up
     change_column_default :games, :required_players, 0
   end

diff --git a/db/migrate/20160422153232_add_archived_at_to_games.rb b/db/migrate/20160422153232_add_archived_at_to_games.rb
@@ -1,4 +1,4 @@
-class AddArchivedAtToGames < ActiveRecord::Migration
+class AddArchivedAtToGames < ActiveRecord::Migration[4.2]
   def change
     add_column :games, :archived_at, :datetime
   end

diff --git a/db/migrate/20160513131956_create_location.rb b/db/migrate/20160513131956_create_location.rb
@@ -1,4 +1,4 @@
-class CreateLocation < ActiveRecord::Migration
+class CreateLocation < ActiveRecord::Migration[4.2]
   def change
     create_table :locations do |t|
       t.string :longitude

diff --git a/db/migrate/20160513132153_add_reference_from_location_to_game.rb b/db/migrate/20160513132153_add_reference_from_location_to_game.rb
@@ -1,4 +1,4 @@
-class AddReferenceFromLocationToGame < ActiveRecord::Migration
+class AddReferenceFromLocationToGame < ActiveRecord::Migration[4.2]
   def change
     add_reference :locations, :game, index: true
   end

diff --git a/db/migrate/20190702161748_add_hour_and_minutes_to_game.rb b/db/migrate/20190702161748_add_hour_and_minutes_to_game.rb
@@ -1,4 +1,4 @@
-class AddHourAndMinutesToGame < ActiveRecord::Migration
+class AddHourAndMinutesToGame < ActiveRecord::Migration[4.2]
   def change
     add_column :games, :datetime, :datetime
   end
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)
		ActionDispatch::Request.parameter_parsers = ActionDispatch::Request.parameter_parsers.except(:json)