Merge branch '18432-switch-to-sassc-rails' into 'master'

Switch to sassc-rails for faster stylesheet compilation

Closes #18432

See merge request gitlab-org/gitlab-ce!26224

3 files changed, 16 insertions, 10 deletions

diff --git a/Gemfile b/Gemfile
index ae9a29370c7..1faacc0801c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -258,8 +258,7 @@ gem 'chronic_duration', '~> 0.10.6'
 gem 'webpack-rails', '~> 0.9.10'
 gem 'rack-proxy', '~> 0.6.0'
 
-gem 'sass-rails', '~> 5.0.6'
-gem 'sass', '~> 3.5'
+gem 'sassc-rails', '~> 2.1.0'
 gem 'uglifier', '~> 2.7.2'
 
 gem 'addressable', '~> 2.5.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 053dd322b01..e02de8292bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -822,12 +822,15 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.6)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
+    sassc-rails (2.1.0)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
@@ -1177,8 +1180,7 @@ DEPENDENCIES
   rubyzip (~> 1.2.2)
   rugged (~> 0.28)
   sanitize (~> 4.6)
-  sass (~> 3.5)
-  sass-rails (~> 5.0.6)
+  sassc-rails (~> 2.1.0)
   scss_lint (~> 0.56.0)
   seed-fu (~> 2.3.7)
   selenium-webdriver (~> 3.141)
diff --git a/changelogs/unreleased/18432-switch-to-sassc-rails.yml b/changelogs/unreleased/18432-switch-to-sassc-rails.yml
new file mode 100644
index 00000000000..1c9d515c52f
--- /dev/null
+++ b/changelogs/unreleased/18432-switch-to-sassc-rails.yml
@@ -0,0 +1,5 @@
+---
+title: Switch to sassc-rails for faster stylesheet compilation
+merge_request: 26224
+author:
+type: changed