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

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
c495f8c1 · Rémy Coutable · 674882fe · 016f3bd0 · c495f8c1 · c495f8c1
Commit c495f8c1 authored Jul 26, 2018 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

Gemfile.lock Gemfile.lock +2 -1

changelogs/unreleased/sh-bump-haml-5-0-4.yml changelogs/unreleased/sh-bump-haml-5-0-4.yml +5 -0

No files found.
--- 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
+---
+title: Bump haml gem to 5.0.4
+merge_request: 20847
+author:
+type: performance