From f6c9bdda19e2291b806f6b49f47c90a35745e9a7 Mon Sep 17 00:00:00 2001
From: Dan Puttick <dputtick@users.noreply.github.com>
Date: Thu, 26 Nov 2020 17:21:39 -0500
Subject: [PATCH 1/2] Use thin 1.8.0

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1390ae45e0..9697e371b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -497,7 +497,7 @@ GEM
     stackprof (0.2.16)
     sucker_punch (2.1.2)
       concurrent-ruby (~> 1.0)
-    thin (1.7.2)
+    thin (1.8.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)

From e87e6700cef6d2b0467d3590f1f06a8d8c95e593 Mon Sep 17 00:00:00 2001
From: Dan Puttick <dputtick@users.noreply.github.com>
Date: Thu, 26 Nov 2020 18:58:17 -0500
Subject: [PATCH 2/2] Move unused build gems from ActionCable group

- blade and sprockets-export are only used by ActionView
- blade-sauce_labs_plugin is no longer used, removed in #34440
---
 Gemfile      | 10 ++++++----
 Gemfile.lock |  5 -----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 88fa4f3ecc..5f0cba44ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -78,10 +78,6 @@ group :cable do
   gem "redis-namespace", github: "resque/redis-namespace"
 
   gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false
-
-  gem "blade", require: false, platforms: [:ruby]
-  gem "blade-sauce_labs_plugin", require: false, platforms: [:ruby]
-  gem "sprockets-export", require: false
 end
 
 # Active Storage
@@ -102,6 +98,12 @@ group :ujs do
   gem "webdrivers"
 end
 
+# Action View
+group :view do
+  gem "blade", require: false, platforms: [:ruby]
+  gem "sprockets-export", require: false
+end
+
 # Add your own local bundler stuff.
 local_gemfile = File.expand_path(".Gemfile", __dir__)
 instance_eval File.read local_gemfile if File.exist? local_gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
index 9697e371b6..a84864a2d9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,10 +177,6 @@ GEM
       thor (>= 0.19.1)
       useragent (~> 0.16.7)
     blade-qunit_adapter (2.0.1)
-    blade-sauce_labs_plugin (0.7.3)
-      childprocess
-      faraday
-      selenium-webdriver
     bootsnap (1.5.0)
       msgpack (~> 1.0)
     builder (3.2.4)
@@ -564,7 +560,6 @@ DEPENDENCIES
   bcrypt (~> 3.1.11)
   benchmark-ips
   blade
-  blade-sauce_labs_plugin
   bootsnap (>= 1.4.4)
   byebug
   capybara (>= 3.26)