diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-14 20:10:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-10-14 20:10:34 +0000 |
| commit | 123669a55107514798ba531ba3a744b3ec8503ee (patch) | |
| tree | d44c8f0dbd7f0426341392c755af60d023a3d808 /app/controllers | |
| parent | a3a80eac110fb9f195eaccd3afd8e8611d1924dc (diff) | |
| parent | 276b3a7bc202bd9b51c8f5401f4c525227f3a4d8 (diff) | |
| download | gitlab-ce-123669a55107514798ba531ba3a744b3ec8503ee.tar.gz | |
Merge branch 'simplify-cross-references' into 'master'
Simplify code around (cross)-references
See merge request !1568
Diffstat (limited to 'app/controllers')
| -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) |