summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-01-17 06:45:14 +0000
committerRobert Speicher <robert@gitlab.com>2017-01-17 06:45:14 +0000
commite7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1 (patch)
treecdf665e5b7ace3569aa40be7e26550e191b00613 /Gemfile.lock
parent78d710388fbabe27481c77cc353610904465c4df (diff)
parentd5e996d1c235acb5db022429b1a5afe9eb329690 (diff)
downloadgitlab-ce-e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1.tar.gz
Merge branch 'switch-to-sassc' into 'master'
Switch to sassc-rails Closes #18432 See merge request !8556
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock19
1 files changed, 12 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 230d1785aa3..4d025683b20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -667,12 +667,17 @@ GEM
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sass (3.4.22)
- 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 (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
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
@@ -971,7 +976,7 @@ DEPENDENCIES
ruby-prof (~> 0.16.2)
rugged (~> 0.24.0)
sanitize (~> 2.0)
- sass-rails (~> 5.0.6)
+ sassc-rails (~> 1.3.0)
scss_lint (~> 0.47.0)
seed-fu (~> 2.3.5)
select2-rails (~> 3.5.9)