diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-05 21:12:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-05 21:12:21 +0300 |
| commit | 25307dda309ede41ea2e67f16f6de25d0ec1c40e (patch) | |
| tree | 8684e28ace0cb742e45a041710dc833fb0b0eadc /app/models/merge_request_diff_commit.rb | |
| parent | 81a37f05815a4c731a2d2c93302ddc554444b637 (diff) | |
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.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request_diff_commit.rb b/app/models/merge_request_diff_commit.rb index f776ac4256c..b1cae0d1e49 100644 --- a/app/models/merge_request_diff_commit.rb +++ b/app/models/merge_request_diff_commit.rb @@ -7,6 +7,7 @@ class MergeRequestDiffCommit < ApplicationRecord include ShaAttribute include CachedCommit include IgnorableColumns + include FromUnion ignore_column %i[author_name author_email committer_name committer_email], remove_with: '14.6', |