diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-09 16:04:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-09 16:04:37 +0000 |
| commit | 780af30f2a51c391d069daed337e706ab45ce42d (patch) | |
| tree | 0d7af0416b44214acaf390f392db5870a3def6ae /app/views | |
| parent | fc607521f27524cf6ecfb9118f5bd5d9b4eafd1e (diff) | |
| parent | 4a3dae2717615c68f0961a201f9c9d2c0b5c3c61 (diff) | |
| download | gitlab-ce-780af30f2a51c391d069daed337e706ab45ce42d.tar.gz | |
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 'app/views')
| -rw-r--r-- | app/views/shared/hook_logs/_content.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/hook_logs/_content.html.haml b/app/views/shared/hook_logs/_content.html.haml index 532712ee6d1..f3b56df0c96 100644 --- a/app/views/shared/hook_logs/_content.html.haml +++ b/app/views/shared/hook_logs/_content.html.haml @@ -30,7 +30,7 @@ %h5 Request body: %pre - :plain + :escaped #{JSON.pretty_generate(hook_log.request_data)} %h5 Response headers: %pre @@ -40,5 +40,5 @@ %h5 Response body: %pre - :plain + :escaped #{hook_log.response_body} |