Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
This commit is contained in:
commit
0f14980383
|
@ -110,9 +110,11 @@ class GitPushService < BaseService
|
||||||
# a different branch.
|
# a different branch.
|
||||||
closed_issues = commit.closes_issues(current_user)
|
closed_issues = commit.closes_issues(current_user)
|
||||||
closed_issues.each do |issue|
|
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)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
commit.create_cross_references!(authors[commit], closed_issues)
|
commit.create_cross_references!(authors[commit], closed_issues)
|
||||||
end
|
end
|
||||||
|
|
|
@ -21,9 +21,11 @@ module MergeRequests
|
||||||
|
|
||||||
closed_issues = merge_request.closes_issues(current_user)
|
closed_issues = merge_request.closes_issues(current_user)
|
||||||
closed_issues.each do |issue|
|
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, merge_request)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def create_merge_event(merge_request, current_user)
|
def create_merge_event(merge_request, current_user)
|
||||||
EventCreateService.new.merge_mr(merge_request, current_user)
|
EventCreateService.new.merge_mr(merge_request, current_user)
|
||||||
|
|
Loading…
Reference in New Issue