From d97b22b18ef528522fbcadf94c9210f8fe651c98 Mon Sep 17 00:00:00 2001
From: Mark Tareshawty <tarebyte@github.com>
Date: Tue, 25 Jul 2023 19:48:15 -0400
Subject: [PATCH 1/2] Upgrade truncato gem to 0.7.12

This upgrades truncato in order to fix our compatability issues with Nokogiri

See https://github.com/jorgemanrubia/truncato/issues/20 for more details
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index a4db9a52..3accab14 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'meta-tags', '~> 2.11', '>= 2.11.1'
 gem 'active_model_serializers', '~> 0.10.9'
 gem 'premailer-rails', '~>1.10.3'
 gem 'gemoji'
-gem 'truncato'
+gem 'truncato', '~> 0.7.12'
 
 group :development, :test do
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
index 407bf6f2..513bf84e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.0.2)
-    mini_portile2 (2.8.2)
+    mini_portile2 (2.8.4)
     minitest (5.14.0)
     msgpack (1.7.1)
     multi_json (1.13.1)
@@ -297,7 +297,7 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    truncato (0.7.11)
+    truncato (0.7.12)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
     turbolinks (5.2.0)
@@ -368,7 +368,7 @@ DEPENDENCIES
   spring-watcher-listen (~> 2.0.0)
   storyblok (~> 2.0.5)
   timecop (~> 0.9.1)
-  truncato
+  truncato (~> 0.7.12)
   turbolinks (~> 5.2)
   twitter_cldr (~> 4.4, >= 4.4.3)
   tzinfo-data

From 11b5843d2508c65f8d16ee02c2d7447649f81aab Mon Sep 17 00:00:00 2001
From: Mark Tareshawty <tarebyte@github.com>
Date: Tue, 25 Jul 2023 20:00:11 -0400
Subject: [PATCH 2/2] Update ci.yml to use main instead of master

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ceec253f..36970dd3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   erb_javascript_rails: