diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-09 19:04:37 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-09 19:04:37 +0300 |
| commit | 780af30f2a51c391d069daed337e706ab45ce42d (patch) | |
| tree | 0d7af0416b44214acaf390f392db5870a3def6ae /Gemfile.rails5.lock | |
| parent | fc607521f27524cf6ecfb9118f5bd5d9b4eafd1e (diff) | |
| parent | 4a3dae2717615c68f0961a201f9c9d2c0b5c3c61 (diff) | |
Merge branch 'upgrade-hamlit-for-ruby25' into 'master'
Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045
Closes #42045
See merge request gitlab-org/gitlab-ce!20315
Diffstat (limited to 'Gemfile.rails5.lock')
| -rw-r--r-- | Gemfile.rails5.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 0bb2e67ab6d..a38ac856e2b 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -384,8 +384,8 @@ GEM rake (>= 10, < 13) rubocop (>= 0.49.0) sysexits (~> 1.1) - hamlit (2.6.1) - temple (~> 0.7.6) + hamlit (2.8.8) + temple (>= 0.8.0) thor tilt hashdiff (0.3.4) @@ -898,7 +898,7 @@ GEM sys-filesystem (1.1.6) ffi sysexits (1.2.0) - temple (0.7.7) + temple (0.8.0) test-prof (0.2.5) text (1.3.1) thin (1.7.0) @@ -1067,7 +1067,7 @@ DEPENDENCIES graphql (~> 1.8.0) grpc (~> 1.11.0) haml_lint (~> 0.26.0) - hamlit (~> 2.6.1) + hamlit (~> 2.8.8) hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) |