From c4b71656c3b131e62f81160c1c8bcf5aa8edc38e Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick.zhang@zendesk.com>
Date: Wed, 15 Mar 2023 11:33:23 +1100
Subject: [PATCH 1/4] Silent loofah deprecation warning

[1] https://github.com/flavorjones/loofah/commit/7cda1210a99721b4fa6fc0f659ac75f00bec6b11
---
 lib/zendesk_apps_support/validations/svg.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/zendesk_apps_support/validations/svg.rb b/lib/zendesk_apps_support/validations/svg.rb
index 57c3e794..163ec6cb 100644
--- a/lib/zendesk_apps_support/validations/svg.rb
+++ b/lib/zendesk_apps_support/validations/svg.rb
@@ -8,13 +8,13 @@ module Svg
       PLACEHOLDER_SVG_MARKUP = File.read(File.expand_path('../../assets/default_app_logo.svg', __FILE__))
 
       # whitelist elements and attributes used in Zendesk Garden assets
-      Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS_WITH_LIBXML2.add 'symbol'
-      Loofah::HTML5::WhiteList::ACCEPTABLE_CSS_PROPERTIES.add 'position'
+      Loofah::HTML5::SafeList::ALLOWED_ELEMENTS_WITH_LIBXML2.add 'symbol'
+      Loofah::HTML5::SafeList::ACCEPTABLE_CSS_PROPERTIES.add 'position'
 
       # CRUFT: ignore a (very specific) style attribute which Loofah would otherwise scrub.
       # This attribute is deprecated (https://www.w3.org/TR/filter-effects/#AccessBackgroundImage)
       # but is included in many of the test apps used in fixtures for tests in ZAM, ZAT etc.
-      Loofah::HTML5::WhiteList::ACCEPTABLE_CSS_PROPERTIES.add 'enable-background'
+      Loofah::HTML5::SafeList::ACCEPTABLE_CSS_PROPERTIES.add 'enable-background'
 
       @strip_declaration = Loofah::Scrubber.new do |node|
         node.remove if node.name == 'xml' && node.children.empty?

From 544c515ff17086c7f16c70d6aa786ce73e2d9eca Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick.zhang@zendesk.com>
Date: Wed, 15 Mar 2023 11:47:43 +1100
Subject: [PATCH 2/4] Fix CI not running on primary branch

---
 .github/workflows/actions.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 1e58760a..92273476 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -2,8 +2,10 @@ name: repo-checks
 
 on:
   pull_request:
+  push:
     branches:
-    - master
+      - master
+      - main
 
 jobs:
   main:

From 67f05ebafcc6d4b0990ce9eca9cc1983b86deeb7 Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick.zhang@zendesk.com>
Date: Wed, 15 Mar 2023 11:49:50 +1100
Subject: [PATCH 3/4] Format GitHub Action files

---
 .github/workflows/actions.yml              | 46 +++++++++++-----------
 .github/workflows/ruby-gem-publication.yml |  3 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 92273476..0b291e4d 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -15,26 +15,26 @@ jobs:
       matrix:
         ruby-version: [3.0.4, 2.7.5, 2.6.10]
     steps:
-    - uses: zendesk/checkout@v3
-    - uses: zendesk/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-    - name: Vendor Cache
-      id: vendor-cache
-      uses: zendesk/cache@v3
-      with:
-        path: vendor/cache
-        key: ${{ runner.os }}-vendor-ruby-${{ matrix.ruby-version }}-lock-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-vendor-ruby-${{ matrix.ruby-version }}-
-          ${{ runner.os }}-vendor-
-    - name: before_script
-      run: |
-        bundle config set --local path 'vendor/cache'
-        bundle install --jobs=3 --retry=3
-    - name: build
-      run: |
-        bundle exec rake
-    - name: lint
-      run: |
-        bundle exec rubocop
+      - uses: zendesk/checkout@v3
+      - uses: zendesk/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Vendor Cache
+        id: vendor-cache
+        uses: zendesk/cache@v3
+        with:
+          path: vendor/cache
+          key: ${{ runner.os }}-vendor-ruby-${{ matrix.ruby-version }}-lock-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-vendor-ruby-${{ matrix.ruby-version }}-
+            ${{ runner.os }}-vendor-
+      - name: before_script
+        run: |
+          bundle config set --local path 'vendor/cache'
+          bundle install --jobs=3 --retry=3
+      - name: build
+        run: |
+          bundle exec rake
+      - name: lint
+        run: |
+          bundle exec rubocop
diff --git a/.github/workflows/ruby-gem-publication.yml b/.github/workflows/ruby-gem-publication.yml
index 8a30e22a..1c7e6f0a 100644
--- a/.github/workflows/ruby-gem-publication.yml
+++ b/.github/workflows/ruby-gem-publication.yml
@@ -2,7 +2,8 @@ name: Ruby Gem Publish
 
 on:
   push:
-    tags: v*
+    tags:
+      - v*
 
 jobs:
   call-workflow:

From 1f98f6a62f6808dde205af311df85ff63a970cdf Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick.zhang@zendesk.com>
Date: Wed, 15 Mar 2023 11:40:59 +1100
Subject: [PATCH 4/4] Bump version to 4.38.3

---
 Gemfile.lock                 | 4 ++--
 zendesk_apps_support.gemspec | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a72066e0..414f593a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zendesk_apps_support (4.38.2)
+    zendesk_apps_support (4.38.3)
       erubis
       i18n
       image_size (~> 2.0.2)
@@ -100,4 +100,4 @@ DEPENDENCIES
   zendesk_apps_support!
 
 BUNDLED WITH
-   2.3.24
+   2.3.26
diff --git a/zendesk_apps_support.gemspec b/zendesk_apps_support.gemspec
index e099349d..56d544f5 100644
--- a/zendesk_apps_support.gemspec
+++ b/zendesk_apps_support.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'zendesk_apps_support'
-  s.version     = '4.38.2'
+  s.version     = '4.38.3'
   s.license     = 'Apache License Version 2.0'
   s.authors     = ['James A. Rosen', 'Likun Liu', 'Sean Caffery', 'Daniel Ribeiro']
   s.email       = ['dev@zendesk.com']