diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-02 18:37:40 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-02 18:37:40 +0300 |
| commit | e4c20cd3fe330faa415493ee2fe30dc16fbaca80 (patch) | |
| tree | 0be61b6cc59cf35d81b9271c7603e0d8b203a31c /app/services/issues/close_service.rb | |
| parent | 25d6a6c4b528159c288995de4909e6a8da431d0b (diff) | |
| parent | 88958e5a9cd364ae36f3d2837982cedb9239c3bc (diff) | |
Merge branch 'master' into sidebar-fly-out-sub-nav
Diffstat (limited to 'app/services/issues/close_service.rb')
| -rw-r--r-- | app/services/issues/close_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb index ddef5281498..74459c3342c 100644 --- a/app/services/issues/close_service.rb +++ b/app/services/issues/close_service.rb @@ -16,13 +16,13 @@ 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, commit: nil, notifications: true, system_note: true) - if project.jira_tracker? && project.jira_service.active + if project.jira_tracker? && project.jira_service.active && issue.is_a?(ExternalIssue) project.jira_service.close_issue(commit, issue) todo_service.close_issue(issue, current_user) return issue end - if project.default_issues_tracker? && issue.close + if project.issues_enabled? && issue.close event_service.close_issue(issue, current_user) create_note(issue, commit) if system_note notification_service.close_issue(issue, current_user) if notifications |