diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-18 22:59:19 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-18 22:59:19 +0000 |
| commit | e26ce27d5bac302785086d426e7b1a4c5b33f74a (patch) | |
| tree | 1e8efcc61d2e4e62aea64282904d1edc47475868 /Gemfile.lock | |
| parent | 717366d28da11acc6dbe60301bf7e2394400b3c1 (diff) | |
| parent | 01fc7633d089faad3314bb8bc1a70d27c27aef70 (diff) | |
| download | gitlab-ce-e26ce27d5bac302785086d426e7b1a4c5b33f74a.tar.gz | |
Merge branch 'rs-issue-21017' into 'master'
Update Hamlit to 2.6.1
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
See merge request !5873
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 f32d30bccd8..fd033360bee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -322,7 +322,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 @@ -867,7 +867,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) |