diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 12:16:37 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 12:16:37 +0100 |
| commit | 7a519bc1e2e904d46b5d6de824f1421ab8c3b0f3 (patch) | |
| tree | 425c3c9d1e1d98e9695a43560e8897e8925ae560 /Gemfile.lock | |
| parent | f30f518f975a04e6fa0baac5a6e366031d6d378d (diff) | |
| parent | 2803b6e84e94bb3a8d85ea9e29aeade450c842a7 (diff) | |
| download | gitlab-ce-7a519bc1e2e904d46b5d6de824f1421ab8c3b0f3.tar.gz | |
Merge branch 'master' into new-buttons
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 7 insertions, 6 deletions
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) |