diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-08 12:35:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-08 12:35:04 +0000 |
| commit | 40704daad839b7a9744b8d9c9ebc82e56ac452a1 (patch) | |
| tree | b78dc964733b5626517be4a380e881d731ce10a2 /app/helpers/merge_requests_helper.rb | |
| parent | 89a15bec5e1916af9e3ac254eb8777af4acddf68 (diff) | |
| parent | bbbef273f74a59a18cf534e147e79e90888d7656 (diff) | |
| download | gitlab-ce-40704daad839b7a9744b8d9c9ebc82e56ac452a1.tar.gz | |
Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'
pass in current_user in MergeRequest and MergeRequestsHelper
See merge request !8624
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 91b24b8bc29..b5f8c23a667 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -64,11 +64,11 @@ module MergeRequestsHelper end def mr_closes_issues - @mr_closes_issues ||= @merge_request.closes_issues + @mr_closes_issues ||= @merge_request.closes_issues(current_user) end def mr_issues_mentioned_but_not_closing - @mr_issues_mentioned_but_not_closing ||= @merge_request.issues_mentioned_but_not_closing + @mr_issues_mentioned_but_not_closing ||= @merge_request.issues_mentioned_but_not_closing(current_user) end def mr_change_branches_path(merge_request) |