summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff_commit.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-23 12:11:53 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-23 12:11:53 +0000
commit4a7ca716f68682c41889dc480c029d71dd121f4e (patch)
tree69b4d87c3e2fc35636e64d1eba0078ea0e1a60b2 /app/models/merge_request_diff_commit.rb
parent946a41d182e40dd37f73c44721edc9bc9c1a0f7c (diff)
downloadgitlab-ce-4a7ca716f68682c41889dc480c029d71dd121f4e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request_diff_commit.rb')
-rw-r--r--app/models/merge_request_diff_commit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff_commit.rb b/app/models/merge_request_diff_commit.rb
index 7e2efa2049b..fc08dd4d9c8 100644
--- a/app/models/merge_request_diff_commit.rb
+++ b/app/models/merge_request_diff_commit.rb
@@ -80,7 +80,7 @@ class MergeRequestDiffCommit < ApplicationRecord
def self.prepare_commits_for_bulk_insert(commits)
user_tuples = Set.new
hashes = commits.map do |commit|
- hash = commit.to_hash.except(:parent_ids)
+ hash = commit.to_hash.except(:parent_ids, :referenced_by)
TRIM_USER_KEYS.each do |key|
hash[key] = MergeRequest::DiffCommitUser.prepare(hash[key])