diff options
| author | Drew Blessing <drew@gitlab.com> | 2015-12-17 16:08:14 -0600 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2015-12-18 14:19:48 -0600 |
| commit | f177aaa5fa789654dc440d6ec4ae3546544c1401 (patch) | |
| tree | 709b259ea7903da9ac28e5393cc29d0780a6c63a /app/services/issues | |
| parent | 27859f7ed9e1efe98b8386844d0a7e69fd58277a (diff) | |
| download | gitlab-ce-f177aaa5fa789654dc440d6ec4ae3546544c1401.tar.gz | |
Backport JIRA service
Diffstat (limited to 'app/services/issues')
| -rw-r--r-- | app/services/issues/close_service.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb index 3d85f97b7e5..a1a20e47681 100644 --- a/app/services/issues/close_service.rb +++ b/app/services/issues/close_service.rb @@ -1,6 +1,11 @@ module Issues class CloseService < Issues::BaseService def execute(issue, commit = nil) + if project.jira_tracker? && project.jira_service.active + project.jira_service.execute(commit, issue) + return issue + end + if project.default_issues_tracker? && issue.close event_service.close_issue(issue, current_user) create_note(issue, commit) |