diff options
| author | micael.bergeron <micael.bergeron@solutionstlm.com> | 2017-07-29 18:04:42 +0300 |
|---|---|---|
| committer | micael.bergeron <micael.bergeron@solutionstlm.com> | 2017-09-06 16:00:57 +0300 |
| commit | 966b1128d884a318dad4277e23368334fe67e836 (patch) | |
| tree | c0007ce9697dfe0fe93b52e619e21e8341c35120 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 8fe1aa5dbbb41cdefffb7177d9eda44ac8652cc7 (diff) | |
WIP: refactor the first-contributor to Issuable
this will remove the need make N queries (per-note) at the
cost of having to mark notes with an attribute
this opens up the possibility for other special roles for notes
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 5095d7fd445..6c4a783e11a 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -60,12 +60,12 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo # Build a note object for comment form @note = @project.notes.new(noteable: @merge_request) - @discussions = @merge_request.discussions - @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes)) - @noteable = @merge_request @commits_count = @merge_request.commits_count + @discussions = @merge_request.discussions + @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes), @noteable) + labels set_pipeline_variables |