diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-01-19 18:29:15 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-19 18:29:15 +0300 |
| commit | fb347f906207d930dea538230723782bceeb2de8 (patch) | |
| tree | 26d0cd671cae47cd9b1e2b3176de63ce921e0764 /Gemfile.lock | |
| parent | 9a985f6ec34d250c4468478a390cb40337d22d33 (diff) | |
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 19 |
1 files changed, 7 insertions, 12 deletions
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) |