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

Merge branch 'security_bug_fix_close_issue' into 'master' 

[Security] Automatic issue closing

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2640

See merge request !1944
This commit is contained in:
Douwe Maan 2016-03-05 00:20:50 +00:00
parent a697b015f7 21a05328ff
commit 5a07032d26
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/git_push_service.rb
View File

@ -96,7 +96,9 @@ class GitPushService < BaseService
# a different branch.
closed_issues = commit.closes_issues(current_user)
closed_issues.each do |issue|
Issues::CloseService.new(project, authors[commit], {}).execute(issue, commit)
if can?(current_user, :update_issue, issue)
Issues::CloseService.new(project, authors[commit], {}).execute(issue, commit)
end
end
end

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

@ -21,7 +21,9 @@ module MergeRequests
closed_issues = merge_request.closes_issues(current_user)
closed_issues.each do |issue|
Issues::CloseService.new(project, current_user, {}).execute(issue, merge_request)
if can?(current_user, :update_issue, issue)
Issues::CloseService.new(project, current_user, {}).execute(issue, merge_request)
end
end
end