diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-12 13:17:07 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-12 13:17:07 +0000 |
| commit | be449047838eb34ac420875e9d3a2eeb92eaff31 (patch) | |
| tree | 505d9767e176f9c4a73db63ede0d6da0ba0b1b23 | |
| parent | 85102b59ee2d676f912de58ca77b6f3331305e24 (diff) | |
| parent | 060eccc70d2f9bbb28feb31ead4046401a3ad671 (diff) | |
| download | gitlab-ce-be449047838eb34ac420875e9d3a2eeb92eaff31.tar.gz | |
Merge branch 'lock-sass-3.5' into 'master'
Specify sass ~> 3.5 in Gemfile
See merge request gitlab-org/gitlab-ce!23716
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 1 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 1 |
3 files changed, 3 insertions, 0 deletions
@@ -277,6 +277,7 @@ gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' gem 'sass-rails', '~> 5.0.6' +gem 'sass', '~> 3.5' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 430025c7bde..b9780d4c23f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1129,6 +1129,7 @@ DEPENDENCIES rufus-scheduler (~> 3.4) rugged (~> 0.27) sanitize (~> 4.6) + sass (~> 3.5) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 9e7bae84299..3d81c570b89 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -1119,6 +1119,7 @@ DEPENDENCIES rufus-scheduler (~> 3.4) rugged (~> 0.27) sanitize (~> 4.6) + sass (~> 3.5) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) |