diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-25 17:38:00 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-25 17:38:00 +0300 |
| commit | 53c2154af5e20c07e20f765dd455170da6f7b611 (patch) | |
| tree | a987903f2e79780c0b26697295e75ed7ca95c73a | |
| parent | 27ed9d958ad939d08d2457e1e64061c5e4f402e4 (diff) | |
| parent | 10ca351dd5f54beff6f6dd14c0d73932451b6355 (diff) | |
Merge branch 'ce-gitaly-np1-mr-creations' into 'master'
CE Allow Gitaly N+1 in MR CreationsController
See merge request gitlab-org/gitlab-ce!25499
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 5639402a1e9..32cefe54613 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -89,7 +89,11 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap def build_merge_request params[:merge_request] ||= ActionController::Parameters.new(source_project: @project) - @merge_request = ::MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute + + # Gitaly N+1 issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/58096 + Gitlab::GitalyClient.allow_n_plus_1_calls do + @merge_request = ::MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute + end end def define_new_vars |