From fb347f906207d930dea538230723782bceeb2de8 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 19 Jan 2017 10:29:15 -0500
Subject: [PATCH] Revert "Merge branch 'switch-to-sassc' into 'master'
"
This reverts commit e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1, reversing
changes made to 78d710388fbabe27481c77cc353610904465c4df.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26762
---
Gemfile | 2 +-
Gemfile.lock | 19 +++++++------------
changelogs/unreleased/switch-to-sassc.yml | 4 ----
3 files changed, 8 insertions(+), 17 deletions(-)
delete mode 100644 changelogs/unreleased/switch-to-sassc.yml
diff --git a/Gemfile b/Gemfile
index 9bf37891f74..bf177977bf4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -219,7 +219,7 @@ gem 'oj', '~> 2.17.4'
gem 'chronic', '~> 0.10.2'
gem 'chronic_duration', '~> 0.10.6'
-gem 'sassc-rails', '~> 1.3.0'
+gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '~> 2.7.2'
gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4d025683b20..230d1785aa3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -667,17 +667,12 @@ GEM
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sass (3.4.22)
- sassc (1.11.1)
- bundler
- ffi (~> 1.9.6)
- sass (>= 3.3.0)
- sassc-rails (1.3.0)
- railties (>= 4.0.0)
- sass
- sassc (~> 1.9)
- sprockets (> 2.11)
- sprockets-rails
- tilt
+ 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)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
@@ -976,7 +971,7 @@ DEPENDENCIES
ruby-prof (~> 0.16.2)
rugged (~> 0.24.0)
sanitize (~> 2.0)
- sassc-rails (~> 1.3.0)
+ sass-rails (~> 5.0.6)
scss_lint (~> 0.47.0)
seed-fu (~> 2.3.5)
select2-rails (~> 3.5.9)
diff --git a/changelogs/unreleased/switch-to-sassc.yml b/changelogs/unreleased/switch-to-sassc.yml
deleted file mode 100644
index 3e6c4baf6d9..00000000000
--- a/changelogs/unreleased/switch-to-sassc.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Switch to sassc-rails for faster stylesheet compilation
-merge_request: 8556
-author: Richard Macklin
--
GitLab