Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

2 files changed, 8 insertions, 8 deletions

diff --git a/app/services/jira/requests/base.rb b/app/services/jira/requests/base.rb
index bae8298d5c8..e4e2736ca2f 100644
--- a/app/services/jira/requests/base.rb
+++ b/app/services/jira/requests/base.rb
@@ -7,20 +7,20 @@ module Jira
 
       JIRA_API_VERSION = 2
 
-      def initialize(jira_service, params = {})
-        @project = jira_service&.project
-        @jira_service = jira_service
+      def initialize(jira_integration, params = {})
+        @project = jira_integration&.project
+        @jira_integration = jira_integration
       end
 
       def execute
-        return ServiceResponse.error(message: _('Jira service not configured.')) unless jira_service&.active?
+        return ServiceResponse.error(message: _('Jira service not configured.')) unless jira_integration&.active?
 
         request
       end
 
       private
 
-      attr_reader :jira_service, :project
+      attr_reader :jira_integration, :project
 
       # We have to add the context_path here because the Jira client is not taking it into account
       def base_api_url
@@ -37,7 +37,7 @@ module Jira
       end
 
       def client
-        @client ||= jira_service.client
+        @client ||= jira_integration.client
       end
 
       def request
diff --git a/app/services/jira/requests/projects/list_service.rb b/app/services/jira/requests/projects/list_service.rb
index 373c536974a..ac9e9bf0be9 100644
--- a/app/services/jira/requests/projects/list_service.rb
+++ b/app/services/jira/requests/projects/list_service.rb
@@ -6,8 +6,8 @@ module Jira
       class ListService < Base
         extend ::Gitlab::Utils::Override
 
-        def initialize(jira_service, params = {})
-          super(jira_service, params)
+        def initialize(jira_integration, params = {})
+          super(jira_integration, params)
 
           @query = params[:query]
         end