diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-07 21:08:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-07 21:08:30 +0300 |
commit | 59776dd803c7fd9d603086e4ea9356f8aedb0e46 (patch) | |
tree | 6cc1065ef86f0680ab8f9dc69cd807ed39ceb221 /app/models/merge_request_diff.rb | |
parent | e1e58fabfa768f47ab82f87ba50b1f2793a8258a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request_diff.rb')
-rw-r--r-- | app/models/merge_request_diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index f58d7788432..d2ea663551d 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -701,7 +701,7 @@ class MergeRequestDiff < ApplicationRecord end def load_commits(limit: nil) - commits = merge_request_diff_commits.limit(limit) + commits = merge_request_diff_commits.with_users.limit(limit) .map { |commit| Commit.from_hash(commit.to_hash, project) } CommitCollection |