From 877ea031d1e634208dcbb90c106c99e5536af13c Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 2 Feb 2021 08:29:30 -0600
Subject: [PATCH] Pin sass/sass-rails

---
 admin/Gemfile      |  3 ++-
 admin/Gemfile.lock | 21 +++++++++------------
 web/Gemfile        |  6 ++++--
 web/Gemfile.lock   | 27 ++++++++++++++++-----------
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/admin/Gemfile b/admin/Gemfile
index e0666e610..3e9cdf729 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -42,11 +42,12 @@ gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
 gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
 gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
 gem 'bcrypt', '3.1.13'
+gem 'sass-rails', '5.0.7' # compiler mismatch issue between build and www
+gem 'sass', '3.5.5 '# compiler mismatch issue between build and www
 #######
 
 gem 'bootstrap-sass', '2.0.4'
 
-gem 'sass-rails' #,   '~> 3.2.3'
 gem 'coffee-rails' #, '~> 3.2.1'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
diff --git a/admin/Gemfile.lock b/admin/Gemfile.lock
index 4f3ea046e..4d852d599 100644
--- a/admin/Gemfile.lock
+++ b/admin/Gemfile.lock
@@ -557,21 +557,17 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sass (3.7.4)
+    sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     select2-rails (4.0.13)
     selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
@@ -712,7 +708,8 @@ DEPENDENCIES
   ruby-protocol-buffers (= 1.2.2)
   rubyzip (= 1.2.1)
   sanitize
-  sass-rails
+  sass (= 3.5.5)
+  sass-rails (= 5.0.7)
   sendgrid (= 1.2.0)
   sendgrid_toolkit (>= 1.1.1)
   simplecov (~> 0.7.1)
diff --git a/web/Gemfile b/web/Gemfile
index 42014244f..3e35abaa5 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -44,7 +44,9 @@ gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
 gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
 gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
 gem 'bcrypt', '3.1.13'
-#######
+gem 'sass-rails', '5.0.7' # compiler mismatch issue between build and www
+gem 'sass', '3.5.5 '# compiler mismatch issue between build and www
+#1######
 
 gem 'responders', '~> 2.0'
 #gem 'sprockets', '3.2.0'
@@ -191,7 +193,7 @@ end
 
 # Gems used only for assets and not required
 # in production environments by default.
-gem 'sass-rails'
+
 gem 'coffee-rails'
 gem 'uglifier'
 gem 'coffee-script-source', '1.12.2'
diff --git a/web/Gemfile.lock b/web/Gemfile.lock
index 5bbec1e29..e2ef91408 100644
--- a/web/Gemfile.lock
+++ b/web/Gemfile.lock
@@ -610,6 +610,9 @@ GEM
       thor (>= 0.18.1, < 2.0)
     raindrops (0.19.1)
     rake (13.0.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     rbvmomi (2.4.1)
       builder (~> 3.0)
       json (>= 1.8)
@@ -696,16 +699,17 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
@@ -902,7 +906,8 @@ DEPENDENCIES
   ruby-protocol-buffers (= 1.2.2)
   rubyzip (= 1.2.1)
   sanitize
-  sass-rails
+  sass (= 3.5.5)
+  sass-rails (= 5.0.7)
   selenium-webdriver
   sendgrid (= 1.2.0)
   sendgrid_toolkit (>= 1.1.1)