Commit 61ad5abc authored by Stan Hu's avatar Stan Hu

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
parents bf365e84 0f1bb836
...@@ -258,8 +258,7 @@ gem 'chronic_duration', '~> 0.10.6' ...@@ -258,8 +258,7 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'webpack-rails', '~> 0.9.10' gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
gem 'sass-rails', '~> 5.0.6' gem 'sassc-rails', '~> 2.1.0'
gem 'sass', '~> 3.5'
gem 'uglifier', '~> 2.7.2' gem 'uglifier', '~> 2.7.2'
gem 'addressable', '~> 2.5.2' gem 'addressable', '~> 2.5.2'
......
...@@ -822,12 +822,15 @@ GEM ...@@ -822,12 +822,15 @@ GEM
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6) sassc (2.0.1)
railties (>= 4.0.0, < 6) ffi (~> 1.9)
sass (~> 3.1) rake
sprockets (>= 2.8, < 4.0) sassc-rails (2.1.0)
sprockets-rails (>= 2.0, < 4.0) railties (>= 4.0.0)
tilt (>= 1.1, < 3) sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sawyer (0.8.1) sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6) addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0) faraday (~> 0.8, < 1.0)
...@@ -1177,8 +1180,7 @@ DEPENDENCIES ...@@ -1177,8 +1180,7 @@ DEPENDENCIES
rubyzip (~> 1.2.2) rubyzip (~> 1.2.2)
rugged (~> 0.28) rugged (~> 0.28)
sanitize (~> 4.6) sanitize (~> 4.6)
sass (~> 3.5) sassc-rails (~> 2.1.0)
sass-rails (~> 5.0.6)
scss_lint (~> 0.56.0) scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7) seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.141) selenium-webdriver (~> 3.141)
......
---
title: Switch to sassc-rails for faster stylesheet compilation
merge_request: 26224
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment