kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ce-gitaly-np1-mr-creations' into 'master'

Browse source 
CE Allow Gitaly N+1 in MR CreationsController

See merge request gitlab-org/gitlab-ce!25499
This commit is contained in:
Stan Hu 2019-02-25 14:38:00 +00:00
commit 53c2154af5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/projects/merge_requests/creations_controller.rb
View file

@ -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