diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 11:06:30 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 11:06:30 +0000 |
| commit | 2803b6e84e94bb3a8d85ea9e29aeade450c842a7 (patch) | |
| tree | abf5f83c2e3a3e91105ae9b76187bdffa64c7514 | |
| parent | 37120872e6f627f083419fd553bc2af1ec8f469d (diff) | |
| parent | 66aaaf1fc1c34291d68ac93295dfdec13c85b871 (diff) | |
| download | gitlab-ce-2803b6e84e94bb3a8d85ea9e29aeade450c842a7.tar.gz | |
Merge branch 'rs-update-sass-rails' into 'master'
Bump sass-rails to ~> 5.0.0
Addressing gitlab-org/gitlab-ce#2857
See merge request !2184
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 13 |
2 files changed, 8 insertions, 7 deletions
@@ -190,7 +190,7 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.3' -gem "sass-rails", '~> 4.0.5' +gem "sass-rails", '~> 5.0.0' gem "coffee-rails", '~> 4.1.0' gem "uglifier", '~> 2.7.2' gem 'turbolinks', '~> 2.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index b8517d932a4..21f405de2f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -647,12 +647,13 @@ GEM safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.2.19) - sass-rails (4.0.5) + sass (3.4.20) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.2) - sprockets (~> 2.8, < 3.0) - sprockets-rails (~> 2.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) sawyer (0.6.0) addressable (~> 2.3.5) faraday (~> 0.8, < 0.10) @@ -934,7 +935,7 @@ DEPENDENCIES rubocop (~> 0.35.0) ruby-fogbugz (~> 0.2.1) sanitize (~> 2.0) - sass-rails (~> 4.0.5) + sass-rails (~> 5.0.0) sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) |