From 1c945d21f1c2e95171639a4a609c718192031036 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 2 Oct 2019 09:01:24 -0400 Subject: [PATCH 01/17] Upgraded listen gem --- Gemfile.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 766035d..64123d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,10 +173,9 @@ GEM launchy (2.4.3) addressable (~> 2.3) libv8 (3.16.14.19) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.2.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -296,7 +295,6 @@ GEM rubocop (>= 0.68.0) ruby-prof (1.0.0) ruby-progressbar (1.10.1) - ruby_dep (1.5.0) sassc (2.2.1) ffi (~> 1.9) sassc-rails (2.1.2) From cba980697e30aa6cdff2a767c090d4da73301d47 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 2 Oct 2019 14:21:57 -0400 Subject: [PATCH 02/17] Upgraded [rspec-expectations, rspec-mocks, rspec-support] gems --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 64123d3..a65f42b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -266,10 +266,10 @@ GEM rspec-mocks (~> 3.8.0) rspec-core (3.8.2) rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rspec-expectations (3.8.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) + rspec-mocks (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-rails (4.0.0.beta2) @@ -280,7 +280,7 @@ GEM rspec-expectations (~> 3.8) rspec-mocks (~> 3.8) rspec-support (~> 3.8) - rspec-support (3.8.2) + rspec-support (3.8.3) rubocop (0.75.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) From 42a03b8c9b629cb05f58ef298804b5dbf7b26eb4 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 3 Oct 2019 09:19:16 -0400 Subject: [PATCH 03/17] Upgraded parser gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a65f42b..ee95b7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -200,7 +200,7 @@ GEM nenv (~> 0.1) shellany (~> 0.0) parallel (1.17.0) - parser (2.6.4.1) + parser (2.6.5.0) ast (~> 2.4.0) poltergeist (1.18.1) capybara (>= 2.1, < 4) From 74bf3daf81fd39dae393fff9909152bc8c7f7cc9 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 7 Oct 2019 09:47:41 -0400 Subject: [PATCH 04/17] Upgraded [i18n, parallel, puma, rails-html-sanitizer, rspec-expectations] gems --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ee95b7f..558c954 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,7 +157,7 @@ GEM guard (>= 2.0.0) guard-compat (~> 1.0) http_parser.rb (0.6.0) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) jaro_winkler (1.5.3) jquery-fileupload-rails (1.0.0) @@ -199,7 +199,7 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - parallel (1.17.0) + parallel (1.18.0) parser (2.6.5.0) ast (~> 2.4.0) poltergeist (1.18.1) @@ -215,7 +215,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.1) - puma (4.2.0) + puma (4.2.1) nio4r (~> 2.0) rack (2.0.7) rack-livereload (0.3.17) @@ -240,8 +240,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails-perftest (0.0.7) railties (6.0.0) actionpack (= 6.0.0) @@ -266,7 +266,7 @@ GEM rspec-mocks (~> 3.8.0) rspec-core (3.8.2) rspec-support (~> 3.8.0) - rspec-expectations (3.8.5) + rspec-expectations (3.8.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-mocks (3.8.2) From a27b53961fe376860f4312f583f6bcd67d48b8d7 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 8 Oct 2019 09:14:24 -0400 Subject: [PATCH 05/17] Upgraded [rspec, rspec-core, rspec-expectations, rspec-mocks, rspec-support] gems --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 558c954..5188af7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,18 +260,18 @@ GEM responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.6) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.2) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) + rspec-support (~> 3.9.0) rspec-rails (4.0.0.beta2) actionpack (>= 4.2) activesupport (>= 4.2) @@ -280,7 +280,7 @@ GEM rspec-expectations (~> 3.8) rspec-mocks (~> 3.8) rspec-support (~> 3.8) - rspec-support (3.8.3) + rspec-support (3.9.0) rubocop (0.75.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) From 93815c34d4893786caafee8d2a33e4e1cee92f97 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 9 Oct 2019 09:46:00 -0400 Subject: [PATCH 06/17] Upgraded [foreman, sprockets, zeitwerk] gems --- Gemfile.lock | 9 +++------ app/assets/config/manifest.js | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 app/assets/config/manifest.js diff --git a/Gemfile.lock b/Gemfile.lock index 5188af7..ee40018 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,6 @@ GEM debug_inspector (0.0.3) diff-lcs (1.3) docile (1.3.2) - dotenv (0.7.0) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) @@ -127,9 +126,7 @@ GEM eventmachine (1.2.7) execjs (2.7.0) ffi (1.11.1) - foreman (0.64.0) - dotenv (~> 0.7.0) - thor (>= 0.13.6) + foreman (0.86.0) formatador (0.2.5) gherkin (5.1.0) globalid (0.4.2) @@ -309,7 +306,7 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (3.7.2) + sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -343,7 +340,7 @@ GEM websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.1.10) + zeitwerk (2.2.0) PLATFORMS ruby diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000..b16e53d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css From 0aad71e95e2a7f0dfa140d6fa48bcd2f623407d9 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 14 Oct 2019 09:15:17 -0400 Subject: [PATCH 07/17] Upgraded multi_json gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ee40018..9542cda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -186,7 +186,7 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.12.2) - multi_json (1.13.1) + multi_json (1.14.0) multi_test (0.1.2) mysql2 (0.5.2) nenv (0.3.0) From 20fe521e818a2f99723203a770ab48ab4b04df95 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 15 Oct 2019 13:53:39 -0400 Subject: [PATCH 08/17] Upgraded [multi_json, rubocop, bundler] gems --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9542cda..4a0aa96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -186,7 +186,7 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.12.2) - multi_json (1.14.0) + multi_json (1.14.1) multi_test (0.1.2) mysql2 (0.5.2) nenv (0.3.0) @@ -278,7 +278,7 @@ GEM rspec-mocks (~> 3.8) rspec-support (~> 3.8) rspec-support (3.9.0) - rubocop (0.75.0) + rubocop (0.75.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -392,4 +392,4 @@ RUBY VERSION ruby 2.7.0p-1 BUNDLED WITH - 2.1.0.pre.1 + 2.1.0.pre.2 From 5e1755962e711cfbe1943f854940a78206bbb49e Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 16 Oct 2019 16:18:42 -0400 Subject: [PATCH 09/17] Upgraded crass gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4a0aa96..1b446e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,7 +98,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.5) contracts (0.16.0) - crass (1.0.4) + crass (1.0.5) cucumber (3.1.2) builder (>= 2.1.2) cucumber-core (~> 3.2.0) From b9b188c99b000b027a1e7741116f6c1fed8ab1a7 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Fri, 18 Oct 2019 12:27:51 -0400 Subject: [PATCH 10/17] Upgraded rspece-rails to 4.0.0.beta3 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 598addf..193d419 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ group :development, :test, :mysql do gem "database_cleaner" gem "launchy" gem "poltergeist" - gem "rspec-rails", '4.0.0.beta2' # 4/26/2019: LOCKED DOWN + gem "rspec-rails", '4.0.0.beta3' # 4/26/2019: LOCKED DOWN gem "test-unit" end diff --git a/Gemfile.lock b/Gemfile.lock index 1b446e5..b8f954a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -269,7 +269,7 @@ GEM rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-rails (4.0.0.beta2) + rspec-rails (4.0.0.beta3) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -375,7 +375,7 @@ DEPENDENCIES rake rb-fsevent responders - rspec-rails (= 4.0.0.beta2) + rspec-rails (= 4.0.0.beta3) rubocop-github ruby-prof sassc-rails From 587a860b40baa6679c238ea938ceb7e372d6d75a Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 22 Oct 2019 15:02:47 -0400 Subject: [PATCH 11/17] Upgraded loofah gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b8f954a..e2889b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,7 +173,7 @@ GEM listen (3.2.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) From c3762d1a94136143bfea051fe0aa054b97508280 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 29 Oct 2019 09:55:05 -0400 Subject: [PATCH 12/17] Upgraded rubocop gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e2889b9..9140591 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM rspec-mocks (~> 3.8) rspec-support (~> 3.8) rspec-support (3.9.0) - rubocop (0.75.1) + rubocop (0.76.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) From 201920cd57fa2f01f7837e712969115096b6fd19 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 30 Oct 2019 09:49:11 -0400 Subject: [PATCH 13/17] Upgraded [jaro_winkler, minitest] gems --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9140591..0e719ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -156,7 +156,7 @@ GEM http_parser.rb (0.6.0) i18n (1.7.0) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.3) + jaro_winkler (1.5.4) jquery-fileupload-rails (1.0.0) actionpack (>= 3.1) railties (>= 3.1) @@ -185,7 +185,7 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.12.2) + minitest (5.13.0) multi_json (1.14.1) multi_test (0.1.2) mysql2 (0.5.2) From 9002c954c24f23af279513800ca607a8e8758b6d Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 31 Oct 2019 12:24:30 -0400 Subject: [PATCH 14/17] Upgraded guard gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0e719ae..9a1656b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,7 +131,7 @@ GEM gherkin (5.1.0) globalid (0.4.2) activesupport (>= 4.2.0) - guard (2.15.1) + guard (2.16.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) From c6280d2128a57ef02e78d1ec2a18352c08b59d00 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 31 Oct 2019 18:32:25 -0400 Subject: [PATCH 15/17] Upgraded nokogiri gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9a1656b..7c7ba99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,7 +191,7 @@ GEM mysql2 (0.5.2) nenv (0.3.0) nio4r (2.5.2) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) notiffany (0.1.3) nenv (~> 0.1) From 55c3e3e307d72d4da1235ddd24ae6ec62a827896 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Fri, 1 Nov 2019 08:34:34 -0400 Subject: [PATCH 16/17] Upgrade [zeitwerk, guard] gems --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7c7ba99..c75ba38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,7 +131,7 @@ GEM gherkin (5.1.0) globalid (0.4.2) activesupport (>= 4.2.0) - guard (2.16.0) + guard (2.16.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -340,7 +340,7 @@ GEM websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.2.0) + zeitwerk (2.2.1) PLATFORMS ruby From 4297f5b57c06d48dd4c27453e8c473f73152e972 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 5 Nov 2019 11:58:13 -0500 Subject: [PATCH 17/17] Downgraded Ruby to 2.6.5 --- .ruby-version | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- Gemfile | 2 +- Gemfile.lock | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ruby-version b/.ruby-version index 7ee07b8..57cf282 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.0-preview1 +2.6.5 diff --git a/.travis.yml b/.travis.yml index ad132c3..600481b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - "2.7.0-preview1" + - "2.6.5" before_install: - "phantomjs --version" diff --git a/Dockerfile b/Dockerfile index 5d3f7c0..d884c2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.0-preview1 +FROM ruby:2.6.5 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs RUN mkdir /myapp WORKDIR /myapp diff --git a/Gemfile b/Gemfile index 193d419..56ea6ef 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" #don't upgrade gem "rails", "6.0.0" -ruby "2.7.0" +ruby "2.6.5" gem "aruba" gem "bcrypt" diff --git a/Gemfile.lock b/Gemfile.lock index c75ba38..bbe0b5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,7 +389,7 @@ DEPENDENCIES unicorn RUBY VERSION - ruby 2.7.0p-1 + ruby 2.6.5p114 BUNDLED WITH - 2.1.0.pre.2 + 1.17.3