diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-14 11:22:12 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-14 11:22:12 +0100 |
| commit | b85d69d1f0b379b2b055eca9695f8055b00e77b5 (patch) | |
| tree | 882cbe797390f1a726174a8283e00c3e62404a5e /Gemfile.lock | |
| parent | 7b1affd426fbf24445df25e439cbda9b6bd4b046 (diff) | |
| parent | 0c4f512bae5b5e67658dd9707430185f1a1f97cc (diff) | |
| download | gitlab-ce-b85d69d1f0b379b2b055eca9695f8055b00e77b5.tar.gz | |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bb5b3602add..c27c06e9c34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -762,9 +762,9 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - scss_lint (0.47.1) - rake (>= 0.9, < 11) - sass (~> 3.4.15) + scss_lint (0.54.0) + rake (>= 0.9, < 13) + sass (~> 3.4.20) securecompare (1.0.0) seed-fu (2.3.6) activerecord (>= 3.1) @@ -1081,7 +1081,7 @@ DEPENDENCIES rugged (~> 0.25.1.1) sanitize (~> 2.0) sass-rails (~> 5.0.6) - scss_lint (~> 0.47.0) + scss_lint (~> 0.54.0) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) sentry-raven (~> 2.5.3) |