diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-02-22 21:10:06 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-02-22 21:59:38 +0000 |
| commit | 10ca351dd5f54beff6f6dd14c0d73932451b6355 (patch) | |
| tree | a7317517341d607228d7785a7b2b7041fdd5c2d5 | |
| parent | 7e37b4e4ef2041f5c1818fdbf7de7fee91608595 (diff) | |
| download | gitlab-ce-10ca351dd5f54beff6f6dd14c0d73932451b6355.tar.gz | |
Allow Gitaly N+1 queries in MR CreationsController
Fixes a master failure due to a reduction in
the accepted Gitaly query count.
| -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 |