summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/merge_request.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index d025062f562..8b285091eda 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -510,12 +510,8 @@ class MergeRequest < ActiveRecord::Base
def create_merge_request_diff
fetch_ref!
-
- # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37435
- Gitlab::GitalyClient.allow_n_plus_1_calls do
- merge_request_diffs.create
- reload_merge_request_diff
- end
+ merge_request_diffs.create
+ reload_merge_request_diff
end
def reload_merge_request_diff