diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-10-05 12:20:32 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-10-05 18:56:12 -0300 |
| commit | 72273d3d508c858710a0eb45920c41f6cfc31112 (patch) | |
| tree | 1b6c6d51f2855363bab4cfc687581a544d9fe02a /app/controllers/projects | |
| parent | e13a3c71c425e8a49ff67eca224766ef763ea065 (diff) | |
| download | gitlab-ce-72273d3d508c858710a0eb45920c41f6cfc31112.tar.gz | |
Remove dead code on main MR page
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index dfb69de650b..ce9fe6f70fe 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -44,12 +44,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo @noteable = @merge_request @commits_count = @merge_request.commits_count - # TODO cleanup- Fatih Simon Create an issue to remove these after the refactoring - # we no longer render notes here. I see it will require a small frontend refactoring, - # since we gather some data from this collection. - @discussions = @merge_request.discussions - @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes), @noteable) - labels set_pipeline_variables |