diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-27 13:18:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-12-27 13:18:21 +0300 |
| commit | 5fabc1fd3b261d098bc8eb80b2750e14a2c979ea (patch) | |
| tree | 77dca8c192125751cea3111107f6c52c1b689890 /app/controllers | |
| parent | 6b02f502c84450d5e23866fef0d3da600d7c78ae (diff) | |
| parent | 7cf4947792647fd985c38ebf37c27989fd5a1632 (diff) | |
Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'
Considerably improve the loading time on merge request's discussion page
Closes #52950
See merge request gitlab-org/gitlab-ce!23857
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 8b8eac7ff8e..162c2636641 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -218,6 +218,12 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo head :ok end + def discussions + merge_request.preload_discussions_diff_highlight + + super + end + protected alias_method :subscribable_resource, :merge_request |