summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-17 09:54:16 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-17 09:54:16 +0100
commit5e405bfea9a2748af2652bf5dc51fce89a1794f3 (patch)
treeb8bfb43caa069fe9aeec1b57f15184ec442bc212 /app
parente3d32ff036ab442b9613d4dbceb473f30da048af (diff)
downloadgitlab-ce-5e405bfea9a2748af2652bf5dc51fce89a1794f3.tar.gz
Update methods that use issue close service
`Issues::CloseService#execute` signature has changed, because of using keyword parameter for commmit.
Diffstat (limited to 'app')
-rw-r--r--app/services/git_push_service.rb2
-rw-r--r--app/services/issues/close_service.rb2
-rw-r--r--app/services/merge_requests/post_merge_service.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index d840ab5e340..855d55b3e58 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -120,7 +120,7 @@ class GitPushService < BaseService
closed_issues = commit.closes_issues(current_user)
closed_issues.each do |issue|
if can?(current_user, :update_issue, issue)
- Issues::CloseService.new(project, authors[commit], {}).execute(issue, commit)
+ Issues::CloseService.new(project, authors[commit], {}).execute(issue, commit: commit)
end
end
end
diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb
index 6866d3fcfb9..859c934ea3b 100644
--- a/app/services/issues/close_service.rb
+++ b/app/services/issues/close_service.rb
@@ -1,6 +1,6 @@
module Issues
class CloseService < Issues::BaseService
- def execute(issue, commit = nil, notifications: true, system_note: true)
+ def execute(issue, commit: nil, notifications: true, system_note: true)
if project.jira_tracker? && project.jira_service.active
project.jira_service.execute(commit, issue)
todo_service.close_issue(issue, current_user)
diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb
index ebb67c7db65..064910f81f7 100644
--- a/app/services/merge_requests/post_merge_service.rb
+++ b/app/services/merge_requests/post_merge_service.rb
@@ -22,7 +22,7 @@ module MergeRequests
closed_issues = merge_request.closes_issues(current_user)
closed_issues.each do |issue|
if can?(current_user, :update_issue, issue)
- Issues::CloseService.new(project, current_user, {}).execute(issue, merge_request)
+ Issues::CloseService.new(project, current_user, {}).execute(issue, commit: merge_request)
end
end
end