Remove Gitaly allow_na_plus_1_calls as we don't seem to need it anymore

0d95d3c0 · David Kim · 56c2e005 · 0d95d3c0
Commit 0d95d3c0 authored Dec 24, 2019 by David Kim
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app/controllers/projects/merge_requests/creations_controller.rb ...ntrollers/projects/merge_requests/creations_controller.rb +1 -4

No files found.
--- a/app/controllers/projects/merge_requests/creations_controller.rb
+++ b/app/controllers/projects/merge_requests/creations_controller.rb
@@ -12,10 +12,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
  before_action :build_merge_request, except: [:create]
  def new
-    # n+1: https://gitlab.com/gitlab-org/gitlab-foss/issues/40934
+    define_new_vars
-    Gitlab::GitalyClient.allow_n_plus_1_calls do
-      define_new_vars
-    end
  end
  def create