diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 21:10:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 21:10:13 +0300 |
| commit | e58ce90f147742c314b9cc08c2d1c0b585e39cf9 (patch) | |
| tree | 467a1716bb63f4061e57b824c0e07532ca2fba4c /app/models/merge_request_diff_commit.rb | |
| parent | 62cd7010ef91dcaa5a5a36790985053db0b38671 (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 | 2 |
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 259690ef308..ed398e0d2e0 100644 --- a/app/models/merge_request_diff_commit.rb +++ b/app/models/merge_request_diff_commit.rb @@ -12,7 +12,7 @@ class MergeRequestDiffCommit < ApplicationRecord sha_attribute :sha alias_attribute :id, :sha - serialize :trailers, Serializers::JSON # rubocop:disable Cop/ActiveRecordSerialize + serialize :trailers, Serializers::Json # rubocop:disable Cop/ActiveRecordSerialize validates :trailers, json_schema: { filename: 'git_trailers' } # Deprecated; use `bulk_insert!` from `BulkInsertSafe` mixin instead. |