diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/models/merge_request_context_commit_diff_file.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/models/merge_request_context_commit_diff_file.rb')
-rw-r--r-- | app/models/merge_request_context_commit_diff_file.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request_context_commit_diff_file.rb b/app/models/merge_request_context_commit_diff_file.rb index b89d1983ce3..6f15df1b70f 100644 --- a/app/models/merge_request_context_commit_diff_file.rb +++ b/app/models/merge_request_context_commit_diff_file.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class MergeRequestContextCommitDiffFile < ApplicationRecord + extend SuppressCompositePrimaryKeyWarning + include Gitlab::EncodingHelper include ShaAttribute include DiffFile |