diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-03 05:15:57 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-03 05:15:57 +0000 |
| commit | 61ad5abc4c96947cd53826c7b4a8d3e572c2595b (patch) | |
| tree | c61149cb8ce267bf0d344ea70004f115ef891d8b /Gemfile.lock | |
| parent | bf365e84f0398a8ff6fc23a4af66764b4d66c29c (diff) | |
| parent | 0f1bb8362be8274f9edd9c9e31ea3451e8961a3b (diff) | |
| download | gitlab-ce-61ad5abc4c96947cd53826c7b4a8d3e572c2595b.tar.gz | |
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 10 insertions, 8 deletions
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) |