Commit f6cb4206 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'refactor-jira-close-service' into 'master'

Move JIRA issue processing to CloseService

See merge request !10
parents 7ae9c92f 421e5775
......@@ -84,11 +84,7 @@ class GitPushService
author ||= commit_user(commit)
issues_to_close.each do |issue|
if project.jira_tracker? && project.jira_service.active
project.jira_service.execute(commit, issue)
else
Issues::CloseService.new(project, author, {}).execute(issue, commit)
end
Issues::CloseService.new(project, author, {}).execute(issue, commit)
end
end
......
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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment