From ee5ce0d4c6371f720218c627f4659d4d2b6ff692 Mon Sep 17 00:00:00 2001 From: Devin Breen Date: Wed, 18 Sep 2024 03:37:36 -0500 Subject: [PATCH 1/3] Rev options to year 20 --- app/models/team.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/team.rb b/app/models/team.rb index 6db1c73..b8db6ec 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -59,6 +59,7 @@ class Team < ApplicationRecord "17th year.. wait, what?", "18th year I'M AN ADULT", "19th year wait are you seriously still doing this?" + "XX" ] def unfinalized From 4747235d487c830607f4e5b8185aa8df84690385 Mon Sep 17 00:00:00 2001 From: Devin Breen Date: Wed, 18 Sep 2024 03:54:17 -0500 Subject: [PATCH 2/3] downgrade ffi to prevent heroku deploy errors --- Gemfile | 3 +++ Gemfile.lock | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 516fcda..4e39843 100644 --- a/Gemfile +++ b/Gemfile @@ -35,6 +35,9 @@ gem 'wisper-activerecord' gem 'nokogiri' gem 'oj' +# requird until upgrade +gem "ffi", "< 1.17.0" + gem 'rails', '~> 5.2.8' # locking psych < 4 mitigates https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias gem 'psych', '< 4' diff --git a/Gemfile.lock b/Gemfile.lock index cf80804..3d3e20f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,7 +109,7 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - ffi (1.17.0) + ffi (1.16.3) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -431,6 +431,7 @@ DEPENDENCIES coffee-rails dotenv-rails factory_bot_rails + ffi (< 1.17.0) haml haml-rails httpclient From 8acfc7078bfe6755be30a3e9c5a82be443a2fb26 Mon Sep 17 00:00:00 2001 From: Devin Breen Date: Wed, 18 Sep 2024 03:57:56 -0500 Subject: [PATCH 3/3] fix silly bug --- app/models/team.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/team.rb b/app/models/team.rb index b8db6ec..4740423 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -58,7 +58,7 @@ class Team < ApplicationRecord "Sweet 16th", "17th year.. wait, what?", "18th year I'M AN ADULT", - "19th year wait are you seriously still doing this?" + "19th year wait are you seriously still doing this?", "XX" ]