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/services/jira/requests/base.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/services/jira/requests/base.rb')
-rw-r--r-- | app/services/jira/requests/base.rb | 12 |
1 files changed, 6 insertions, 6 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 |