diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-01-11 16:20:13 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-01-12 13:19:05 +0000 |
| commit | f3cf8cc8d1625ae1cd532474191739cd36419425 (patch) | |
| tree | eb837a49f9d8d9546a505f62b62e2b59307bb2b4 /app/models/commit.rb | |
| parent | 678a00d60a21fcd39fa5c8043fadc4a94e618f4d (diff) | |
| download | gitlab-ce-f3cf8cc8d1625ae1cd532474191739cd36419425.tar.gz | |
Only search for MR revert commits on notes after MR was merged41807-15665-consistently-502s-because-it-fetches-every-commit
If we search for notes before the MR was merged, we have to load every commit
that was ever part of the MR, or mentioned in a push. In extreme cases, this can
be tens of thousands of commits to load, but we know they can't revert the merge
commit, because they are from before the MR was merged.
In the (rare) case that we don't have a `merged_at` value for the MR, we can
still search all notes.
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 39d7f5b159d..ede8ad301e4 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -342,10 +342,11 @@ class Commit @merged_merge_request_hash[current_user] end - def has_been_reverted?(current_user, noteable = self) + def has_been_reverted?(current_user, notes_association = nil) ext = all_references(current_user) + notes_association ||= notes_with_associations - noteable.notes_with_associations.system.each do |note| + notes_association.system.each do |note| note.all_references(current_user, extractor: ext) end |