Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 4 insertions, 5 deletions

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 74145a70b95..cad13d7e708 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -85,14 +85,13 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def integration
     @integration ||= @project.find_or_initialize_service(params[:id])
-    @service ||= @integration # TODO: remove references to @service
   end
   alias_method :service, :integration
 
   def web_hook_logs
-    return unless @service.service_hook.present?
+    return unless integration.service_hook.present?
 
-    @web_hook_logs ||= @service.service_hook.web_hook_logs.recent.page(params[:page])
+    @web_hook_logs ||= integration.service_hook.web_hook_logs.recent.page(params[:page])
   end
 
   def ensure_service_enabled
@@ -101,8 +100,8 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def serialize_as_json
     integration
-      .as_json(only: @service.json_fields)
-      .merge(errors: @service.errors.as_json)
+      .as_json(only: integration.json_fields)
+      .merge(errors: integration.errors.as_json)
   end
 
   def redirect_deprecated_prometheus_service