summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-08-18 13:20:50 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-08-18 13:26:32 -0500
commit01fc7633d089faad3314bb8bc1a70d27c27aef70 (patch)
treec937e3003cb501b75580678da2bb4f0782616972 /Gemfile.lock
parent83bbca26f48242461606f76f69f3e3bb462666d0 (diff)
downloadgitlab-ce-01fc7633d089faad3314bb8bc1a70d27c27aef70.tar.gz
Update Hamlit to 2.6.1rs-issue-21017
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2244c20203b..cab94294dc1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -321,7 +321,7 @@ GEM
grape-entity (0.4.8)
activesupport
multi_json (>= 1.3.2)
- hamlit (2.5.0)
+ hamlit (2.6.1)
temple (~> 0.7.6)
thor
tilt
@@ -863,7 +863,7 @@ DEPENDENCIES
gon (~> 6.1.0)
grape (~> 0.15.0)
grape-entity (~> 0.4.2)
- hamlit (~> 2.5)
+ hamlit (~> 2.6.1)
health_check (~> 2.1.0)
hipchat (~> 1.5.0)
html-pipeline (~> 1.11.0)