diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-10-12 11:54:46 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-10-12 11:54:46 +0200 |
commit | b0164771ec693ff58504ece560371ffec11f9ca9 (patch) | |
tree | 3668a45479d72788bf8c2ed9390992bfa74f1c76 /app/controllers/projects | |
parent | 03b7fe71a5c5372fc8239a26e757685ab12eed87 (diff) | |
download | gitlab-ce-b0164771ec693ff58504ece560371ffec11f9ca9.tar.gz |
Simplify code around (cross)-references
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 0f89f2e88cc..4612abcbae8 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -55,7 +55,7 @@ class Projects::IssuesController < Projects::ApplicationController end def show - @participants = @issue.participants(current_user, @project) + @participants = @issue.participants(current_user) @note = @project.notes.new(noteable: @issue) @notes = @issue.notes.inc_author.fresh @noteable = @issue diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 7570934e727..98df6984bf7 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -246,7 +246,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def define_show_vars - @participants = @merge_request.participants(current_user, @project) + @participants = @merge_request.participants(current_user) # Build a note object for comment form @note = @project.notes.new(noteable: @merge_request) |