diff options
| author | Matthew Dawson <matthew@mjdsystems.ca> | 2018-07-02 12:19:57 -0400 |
|---|---|---|
| committer | Matthew Dawson <matthew@mjdsystems.ca> | 2018-07-08 15:42:30 -0400 |
| commit | 4a3dae2717615c68f0961a201f9c9d2c0b5c3c61 (patch) | |
| tree | 46d71cf0ab3ca8c766586f7e8b06f4cde5720c59 /Gemfile.lock | |
| parent | 96eb6fd33b5dfc4910d8bd93e697d6b6eb70b991 (diff) | |
| download | gitlab-ce-4a3dae2717615c68f0961a201f9c9d2c0b5c3c61.tar.gz | |
Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045
Also update the hook logs to escape the contents properly, as the :plain
filter does not do html escaping.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a889c4dc3a0..ee5da96665c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -381,8 +381,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) @@ -889,7 +889,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) test_after_commit (1.1.0) activerecord (>= 3.2) @@ -900,7 +900,7 @@ GEM rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.6) + tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) toml (0.1.2) @@ -1057,7 +1057,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) |