diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-09 16:34:11 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-09 16:34:11 +0000 |
| commit | 61ab1f7364b1ea44984a67bb6ea0f5a2b7a353c8 (patch) | |
| tree | 82252d55131bebe2d7b250b0231f37b61d4941fe /app/services/merge_requests | |
| parent | 7d351a24258af028998a8c0e7bed749239a255c8 (diff) | |
| parent | 469844c4f926c408cda4cb5b2a08dfd14a2c3997 (diff) | |
| download | gitlab-ce-61ab1f7364b1ea44984a67bb6ea0f5a2b7a353c8.tar.gz | |
Merge branch 'docs-zj-update-n-plus-one-comments' into 'master'
Update comments about N + 1 Gitaly calls
See merge request gitlab-org/gitlab-ce!27178
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/refresh_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index e0460f7081c..3abea1ad1ae 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -14,7 +14,9 @@ module MergeRequests private def refresh_merge_requests! + # n + 1: https://gitlab.com/gitlab-org/gitlab-ce/issues/60289 Gitlab::GitalyClient.allow_n_plus_1_calls(&method(:find_new_commits)) + # Be sure to close outstanding MRs before reloading them to avoid generating an # empty diff during a manual merge close_upon_missing_source_branch_ref |