diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 18:08:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 18:08:15 +0300 |
commit | c2b98d3dbd47ab92c79c702276fe9130d9a28036 (patch) | |
tree | bf4071f551fdc12c22b23b2bb66483064e7b9ea9 /app/views/projects/hook_logs | |
parent | badb9c1deacbea601b02f88811b7e123589d9251 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/hook_logs')
-rw-r--r-- | app/views/projects/hook_logs/_index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/hook_logs/show.html.haml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/projects/hook_logs/_index.html.haml b/app/views/projects/hook_logs/_index.html.haml index 3e54c3ca9f8..ada986dd969 100644 --- a/app/views/projects/hook_logs/_index.html.haml +++ b/app/views/projects/hook_logs/_index.html.haml @@ -28,7 +28,7 @@ %td.light = time_ago_with_tooltip(hook_log.created_at) %td - = link_to 'View details', project_hook_hook_log_path(project, hook, hook_log) + = link_to 'View details', hook_log.present.details_path = paginate hook_logs, theme: 'gitlab' diff --git a/app/views/projects/hook_logs/show.html.haml b/app/views/projects/hook_logs/show.html.haml index bd8ca5e7d70..a8796cd7b1c 100644 --- a/app/views/projects/hook_logs/show.html.haml +++ b/app/views/projects/hook_logs/show.html.haml @@ -3,7 +3,6 @@ %h4.prepend-top-0 Request details .col-lg-9 - - = link_to 'Resend Request', retry_project_hook_hook_log_path(@project, @hook, @hook_log), method: :post, class: "btn btn-default float-right prepend-left-10" + = link_to 'Resend Request', @hook_log.present.retry_path, method: :post, class: "btn btn-default float-right prepend-left-10" = render partial: 'shared/hook_logs/content', locals: { hook_log: @hook_log } |