summaryrefslogtreecommitdiff
path: root/app/services/issues
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-03 15:07:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-03 15:07:07 +0000
commit9a1c5456747a7b5b218b8b44e4b43396bf7fd705 (patch)
treedc5873f33437c897389e923a59365fb192d87fb8 /app/services/issues
parent927cfbfe63dd3dc64df9d341d7c4328a2fe3597f (diff)
downloadgitlab-ce-9a1c5456747a7b5b218b8b44e4b43396bf7fd705.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/issues')
-rw-r--r--app/services/issues/close_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb
index 965351b5b6c..14585c2850b 100644
--- a/app/services/issues/close_service.rb
+++ b/app/services/issues/close_service.rb
@@ -4,7 +4,7 @@ module Issues
class CloseService < Issues::BaseService
# Closes the supplied issue if the current user is able to do so.
def execute(issue, commit: nil, notifications: true, system_note: true)
- return issue unless can?(current_user, :update_issue, issue)
+ return issue unless can?(current_user, :update_issue, issue) || issue.is_a?(ExternalIssue)
close_issue(issue,
closed_via: commit,