Revert "Merge branch 'switch-to-sassc' into 'master'
This reverts commite7fdb1aae5
, reversing changes made to78d710388f
. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26762
This commit is contained in:
parent
9a985f6ec3
commit
fb347f9062
3 changed files with 8 additions and 17 deletions
2
Gemfile
2
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'
|
||||
|
|
19
Gemfile.lock
19
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)
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
title: Switch to sassc-rails for faster stylesheet compilation
|
||||
merge_request: 8556
|
||||
author: Richard Macklin
|
Loading…
Reference in a new issue