diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-07-07 17:54:39 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-07-07 17:54:39 +0300 |
| commit | b8c4d5e0f552dc9986883bd9c8783c7f43f125ce (patch) | |
| tree | 06478887ace997e9b5735f797ddd64b7f028dc6d /app/models/diff_note.rb | |
| parent | 97611c88fcbae6b025750e6ebf2061a3d87d9753 (diff) | |
| parent | c88739ffa6ad99fbd5e20a6e8f2ee251996ea18b (diff) | |
Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-group
Diffstat (limited to 'app/models/diff_note.rb')
| -rw-r--r-- | app/models/diff_note.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 20ef1378500..e9a60e6ce09 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -6,9 +6,9 @@ class DiffNote < Note NOTEABLE_TYPES = %w(MergeRequest Commit).freeze - serialize :original_position, Gitlab::Diff::Position # rubocop:disable Cop/ActiverecordSerialize - serialize :position, Gitlab::Diff::Position # rubocop:disable Cop/ActiverecordSerialize - serialize :change_position, Gitlab::Diff::Position # rubocop:disable Cop/ActiverecordSerialize + serialize :original_position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize + serialize :position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize + serialize :change_position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize validates :original_position, presence: true validates :position, presence: true |