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 /lib/gitlab/jira_import.rb | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'lib/gitlab/jira_import.rb')
| -rw-r--r-- | lib/gitlab/jira_import.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/jira_import.rb b/lib/gitlab/jira_import.rb index 75d6fdc07b6..60344e4be68 100644 --- a/lib/gitlab/jira_import.rb +++ b/lib/gitlab/jira_import.rb @@ -19,10 +19,10 @@ module Gitlab return unless configuration_check - jira_service = project.jira_service + jira_integration = project.jira_integration - raise Projects::ImportService::Error, _('Jira integration not configured.') unless jira_service&.active? - raise Projects::ImportService::Error, _('Unable to connect to the Jira instance. Please check your Jira integration configuration.') unless jira_service&.valid_connection? + raise Projects::ImportService::Error, _('Jira integration not configured.') unless jira_integration&.active? + raise Projects::ImportService::Error, _('Unable to connect to the Jira instance. Please check your Jira integration configuration.') unless jira_integration&.valid_connection? end def self.jira_item_cache_key(project_id, jira_item_id, collection_type) |