diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/controllers/projects/service_hook_logs_controller.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/controllers/projects/service_hook_logs_controller.rb')
-rw-r--r-- | app/controllers/projects/service_hook_logs_controller.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/controllers/projects/service_hook_logs_controller.rb b/app/controllers/projects/service_hook_logs_controller.rb index 5c814ea139f..88de0b7ba0d 100644 --- a/app/controllers/projects/service_hook_logs_controller.rb +++ b/app/controllers/projects/service_hook_logs_controller.rb @@ -1,20 +1,23 @@ # frozen_string_literal: true class Projects::ServiceHookLogsController < Projects::HookLogsController - before_action :service, only: [:show, :retry] + extend Gitlab::Utils::Override + + before_action :integration, only: [:show, :retry] def retry execute_hook - redirect_to edit_project_service_path(@project, @service) + redirect_to edit_project_service_path(@project, @integration) end private - def hook - @hook ||= service.service_hook + def integration + @integration ||= @project.find_or_initialize_integration(params[:service_id]) end - def service - @service ||= @project.find_or_initialize_service(params[:service_id]) + override :hook + def hook + @hook ||= integration.service_hook || not_found end end |