diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-26 13:06:08 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-26 13:06:08 +0300 |
| commit | c495f8c1d8a710972cbcf4aac6ad487419cc843c (patch) | |
| tree | c06189dc5079f4f537aace7d4f9fc1464b3c0785 /Gemfile.lock | |
| parent | 674882fe5dad76bdedd57f364ef2819b7e4f931f (diff) | |
| parent | 016f3bd05d6ec6925ab1a20232b28d1ab12f6464 (diff) | |
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f370adfc810..d147f81c81e 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) |