diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-11-02 12:08:22 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-06 19:59:23 +0800 |
| commit | 79de13684beb777848c2128240acadbbd0e27f52 (patch) | |
| tree | e5d9a50ff9816fb48316fbdcd26786e80f9e7c8a | |
| parent | dcfe76bdbeff55c7b6d76f970b9f1b48bd21fc32 (diff) | |
| download | gitlab-ce-79de13684beb777848c2128240acadbbd0e27f52.tar.gz | |
Merge branch '39704-fix-webhooks_log_time' into 'master'
Fix webhook recent deliveries elapsed time field
Closes #39704
See merge request gitlab-org/gitlab-ce!15146
| -rw-r--r-- | app/views/admin/hook_logs/_index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/hook_logs/_index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/hook_logs/_content.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/39704_fix_webhooks_log_time.yml | 5 | ||||
| -rw-r--r-- | doc/user/project/integrations/img/webhook_logs.png | bin | 24066 -> 132319 bytes |
5 files changed, 8 insertions, 3 deletions
diff --git a/app/views/admin/hook_logs/_index.html.haml b/app/views/admin/hook_logs/_index.html.haml index 7dd9943190f..91a8c0c62fe 100644 --- a/app/views/admin/hook_logs/_index.html.haml +++ b/app/views/admin/hook_logs/_index.html.haml @@ -24,7 +24,7 @@ %td = truncate(hook_log.url, length: 50) %td.light - #{number_with_precision(hook_log.execution_duration, precision: 2)} ms + #{number_with_precision(hook_log.execution_duration, precision: 2)} sec %td.light = time_ago_with_tooltip(hook_log.created_at) %td diff --git a/app/views/projects/hook_logs/_index.html.haml b/app/views/projects/hook_logs/_index.html.haml index 05b06cfc8b2..8096d9530c3 100644 --- a/app/views/projects/hook_logs/_index.html.haml +++ b/app/views/projects/hook_logs/_index.html.haml @@ -24,7 +24,7 @@ %td = truncate(hook_log.url, length: 50) %td.light - #{number_with_precision(hook_log.execution_duration, precision: 2)} ms + #{number_with_precision(hook_log.execution_duration, precision: 2)} sec %td.light = time_ago_with_tooltip(hook_log.created_at) %td diff --git a/app/views/shared/hook_logs/_content.html.haml b/app/views/shared/hook_logs/_content.html.haml index af6a499fadb..c80b179d525 100644 --- a/app/views/shared/hook_logs/_content.html.haml +++ b/app/views/shared/hook_logs/_content.html.haml @@ -11,7 +11,7 @@ = hook_log.trigger.singularize.titleize %p %strong Elapsed time: - #{number_with_precision(hook_log.execution_duration, precision: 2)} ms + #{number_with_precision(hook_log.execution_duration, precision: 2)} sec %p %strong Request time: = time_ago_with_tooltip(hook_log.created_at) diff --git a/changelogs/unreleased/39704_fix_webhooks_log_time.yml b/changelogs/unreleased/39704_fix_webhooks_log_time.yml new file mode 100644 index 00000000000..1234663e66b --- /dev/null +++ b/changelogs/unreleased/39704_fix_webhooks_log_time.yml @@ -0,0 +1,5 @@ +--- +title: Fix webhooks recent deliveries +merge_request: 15146 +author: Alexander Randa (@randaalex) +type: fixed diff --git a/doc/user/project/integrations/img/webhook_logs.png b/doc/user/project/integrations/img/webhook_logs.png Binary files differindex 917068d9398..803678db6b6 100644 --- a/doc/user/project/integrations/img/webhook_logs.png +++ b/doc/user/project/integrations/img/webhook_logs.png |
