diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-01 20:52:10 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-01 20:52:10 +0000 |
| commit | f89a3349c046ba64a37c9e8253263bbb768e65b1 (patch) | |
| tree | 911a9848eb5bdcfe7853e08b97a24f6a67093696 /Gemfile.lock | |
| parent | 31d73135b73c138af4404bd006f33a2ae28f9293 (diff) | |
| parent | 8f7cde0f61d743f35d6907a0b3a1fca340ed987d (diff) | |
| download | gitlab-ce-f89a3349c046ba64a37c9e8253263bbb768e65b1.tar.gz | |
Merge branch 'upgrade-sass-rails' into 'master'
Upgrade sass-rails
## What does this MR do?
Upgrades sass-rails from 5.0.4 to 5.0.5. Includes support for Rails 5.
Changelog: https://github.com/rails/sass-rails/releases
Working toward #14286
See merge request !5030
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4e80f67f640..b2e240feef3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -632,8 +632,8 @@ GEM sanitize (2.1.0) nokogiri (>= 1.4.4) sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) |