diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-12-06 18:54:57 +0300 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-12-13 19:40:19 +0300 |
| commit | 835a5db376a69dce20ba616d480a5a9ab15b2577 (patch) | |
| tree | 0ecba5bbfa679966cba50e62b0ff19c4d944fc12 /app/controllers | |
| parent | 689bc9ea6db102006b548e6176125157955c7f2b (diff) | |
Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly
Closes gitaly#808
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 1511fc08c89..dc524b790a0 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -9,7 +9,10 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap before_action :build_merge_request, except: [:create] def new - define_new_vars + # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/40934 + Gitlab::GitalyClient.allow_n_plus_1_calls do + define_new_vars + end end def create |