diff options
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 2a56bab48a3..8d9a30397a9 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -415,8 +415,11 @@ class MergeRequest < ActiveRecord::Base end def create_merge_request_diff - merge_request_diffs.create - reload_merge_request_diff + # 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 end def reload_merge_request_diff @@ -955,8 +958,6 @@ class MergeRequest < ActiveRecord::Base end def update_project_counter_caches - return unless update_project_counter_caches? - Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache end |