kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

This commit is contained in:
Dmitriy Zaporozhets 2016-03-09 10:13:09 +01:00
parent c674ffe0e0 5a07032d26
commit 0f14980383
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/git_push_service.rb
View File

@ -110,9 +110,11 @@ class GitPushService < BaseService
# a different branch.
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)
end
end
end
commit.create_cross_references!(authors[commit], closed_issues)
end

2
app/services/merge_requests/post_merge_service.rb
View File

@ -21,9 +21,11 @@ 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)
end
end
end
def create_merge_event(merge_request, current_user)
EventCreateService.new.merge_mr(merge_request, current_user)