Merge branch 'sh-bump-haml-5.0.4' into 'master'

Bump haml gem to 5.0.4 See merge request gitlab-org/gitlab-ce!20847
2018-07-26 10:06:08 +00:00 · 2018-07-26 10:06:08 +00:00 · c495f8c1d8
parent 674882fe5d 016f3bd05d
commit c495f8c1d8
2 changed files with 7 additions and 1 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -375,7 +375,8 @@ GEM
      google-protobuf (~> 3.1)
      googleapis-common-protos-types (~> 1.0.0)
      googleauth (>= 0.5.1, < 0.7)
-    haml (4.0.7)
+    haml (5.0.4)
+      temple (>= 0.8.0)
      tilt
    haml_lint (0.26.0)
      haml (>= 4.0, < 5.1)
--- a/changelogs/unreleased/sh-bump-haml-5-0-4.yml
+++ b/changelogs/unreleased/sh-bump-haml-5-0-4.yml
@ -0,0 +1,5 @@
+---
+title: Bump haml gem to 5.0.4
+merge_request: 20847
+author:
+type: performance