diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-09-06 20:14:09 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-09-06 20:14:09 +0300 |
commit | 1c55b5717556f77191409f0f35d25abe6a640af0 (patch) | |
tree | 38c0abf8a996bc39981d5c883cb66d0cd3c538fe /app/controllers/projects/merge_requests | |
parent | 92823171d08bd0516d49e0c86a5e7496bdebe382 (diff) | |
parent | 6d8e102c740b75ac9e1d168a84f532f6d9ebaa65 (diff) |
Merge branch '34509-improves-markdown-rendering-performance-for-commits-list' into 'master'
Resolve "Projects::CommitsController#show is slow partially due to SQL queries"
Closes #34509
See merge request !13762
Diffstat (limited to 'app/controllers/projects/merge_requests')
-rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index f35d53896ba..1096afbb798 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -1,6 +1,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::ApplicationController include DiffForPath include DiffHelper + include RendersCommits skip_before_action :merge_request skip_before_action :ensure_ref_fetched @@ -107,7 +108,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap @target_project = @merge_request.target_project @source_project = @merge_request.source_project - @commits = @merge_request.commits + @commits = prepare_commits_for_rendering(@merge_request.commits) @commit = @merge_request.diff_head_commit @note_counts = Note.where(commit_id: @commits.map(&:id)) |