diff options
author | Stan Hu <stanhu@gmail.com> | 2018-07-25 13:24:33 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-07-25 14:17:15 -0700 |
commit | 016f3bd05d6ec6925ab1a20232b28d1ab12f6464 (patch) | |
tree | 94069c664a1115191be524d806a9fed755e057da | |
parent | d22db4f492d5ae676bea6bc699203d2fc120fe96 (diff) | |
download | gitlab-ce-016f3bd05d6ec6925ab1a20232b28d1ab12f6464.tar.gz |
Bump haml gem to 5.0.4
As pointed out in #49625, this version is needed to support Ruby 2.5.
See https://github.com/haml/haml/blob/master/CHANGELOG.md for more details.
-rw-r--r-- | Gemfile.lock | 3 | ||||
-rw-r--r-- | changelogs/unreleased/sh-bump-haml-5-0-4.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5bb7bc53962..9ec9039bd2e 100644 --- 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) diff --git a/changelogs/unreleased/sh-bump-haml-5-0-4.yml b/changelogs/unreleased/sh-bump-haml-5-0-4.yml new file mode 100644 index 00000000000..269b1e55417 --- /dev/null +++ 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 |