summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-22 15:29:10 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:32:42 -0600
commit56c5b2114021f395d4507bed8ad328ae2a35aa45 (patch)
tree09b4308957fd6b76d96600820ad2144b9c7fd295 /Gemfile.lock
parentcee2f0d4569d48e5fcab842d56cd325685a16772 (diff)
downloadgitlab-ce-56c5b2114021f395d4507bed8ad328ae2a35aa45.tar.gz
Update haml_lint to work with newest rubocop
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 34b24a6e23b..b46b09c7544 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,10 +319,10 @@ GEM
multi_json (>= 1.3.2)
haml (4.0.7)
tilt
- haml_lint (0.18.2)
+ haml_lint (0.21.0)
haml (~> 4.0)
- rake (>= 10, < 12)
- rubocop (>= 0.36.0)
+ rake (>= 10, < 13)
+ rubocop (>= 0.47.0)
sysexits (~> 1.1)
hamlit (2.6.1)
temple (~> 0.7.6)
@@ -759,7 +759,7 @@ GEM
rack (>= 1, < 3)
thor (0.19.4)
thread_safe (0.3.5)
- tilt (2.0.5)
+ tilt (2.0.6)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
tool (0.2.3)
@@ -888,7 +888,7 @@ DEPENDENCIES
google-api-client (~> 0.8.6)
grape (~> 0.18.0)
grape-entity (~> 0.6.0)
- haml_lint (~> 0.18.2)
+ haml_lint (~> 0.21.0)
hamlit (~> 2.6.1)
health_check (~> 2.2.0)
hipchat (~> 1.5.0)