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 /Gemfile | |
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
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 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' |