From 0301a0cad0063d76b1607358dc6c711ea043fdda Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 13 Mar 2020 06:09:37 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/issues/close_service.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'app/services/issues') diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb index d5a542a418d..2cf4bbcd590 100644 --- a/app/services/issues/close_service.rb +++ b/app/services/issues/close_service.rb @@ -18,9 +18,9 @@ module Issues # The code calling this method is responsible for ensuring that a user is # allowed to close the given issue. def close_issue(issue, closed_via: nil, notifications: true, system_note: true) - if project.jira_tracker_active? && issue.is_a?(ExternalIssue) - project.jira_service.close_issue(closed_via, issue) - todo_service.close_issue(issue, current_user) + if issue.is_a?(ExternalIssue) + close_external_issue(issue, closed_via) + return issue end @@ -47,6 +47,13 @@ module Issues private + def close_external_issue(issue, closed_via) + return unless project.external_issue_tracker&.support_close_issue? + + project.external_issue_tracker.close_issue(closed_via, issue) + todo_service.close_issue(issue, current_user) + end + def create_note(issue, current_commit) SystemNoteService.change_status(issue, issue.project, current_user, issue.state, current_commit) end -- cgit v1.2.3