diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-19 15:38:05 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-01-19 19:34:47 +0100 |
| commit | 8cdd3887889c425a72a23ad36fa767554b9c110a (patch) | |
| tree | 872103f03effd2ec803160c935e5cd89a8e61960 | |
| parent | fc025574b2f88d38b50c0243e17c82f37f9c4eac (diff) | |
| download | gitlab-ce-8cdd3887889c425a72a23ad36fa767554b9c110a.tar.gz | |
Merge branch 'rs-revert-sassc' into 'master'
Revert "Merge branch 'switch-to-sassc' into 'master'"
Closes #26762
See merge request !8642
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 19 | ||||
| -rw-r--r-- | changelogs/unreleased/switch-to-sassc.yml | 4 |
3 files changed, 8 insertions, 17 deletions
@@ -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' 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) diff --git a/changelogs/unreleased/switch-to-sassc.yml b/changelogs/unreleased/switch-to-sassc.yml deleted file mode 100644 index 3e6c4baf6d9..00000000000 --- a/changelogs/unreleased/switch-to-sassc.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Switch to sassc-rails for faster stylesheet compilation -merge_request: 8556 -author: Richard Macklin |