diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-18 14:49:52 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-18 14:49:52 +0000 |
| commit | 1fe6405a6ef936a4694c42569c252d92c345d0dc (patch) | |
| tree | d2dd88095b4aa05ed89907f60d836164a3512d9b | |
| parent | 11deffa39f2b07605c3a924f227d3176158b51bc (diff) | |
| parent | f665e5b8fb8fe5c360e716121e94a497788fd6d5 (diff) | |
| download | gitlab-ce-1fe6405a6ef936a4694c42569c252d92c345d0dc.tar.gz | |
Merge branch 'jprovazn-fix-diff-note' into 'master'
Fix serialization of LegacyDiffNote
Closes #49355
See merge request gitlab-org/gitlab-ce!20685
| -rw-r--r-- | changelogs/unreleased/fix-diff-note.yml | 5 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | spec/factories/notes.rb | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-diff-note.yml b/changelogs/unreleased/fix-diff-note.yml new file mode 100644 index 00000000000..6f10f86b9bc --- /dev/null +++ b/changelogs/unreleased/fix-diff-note.yml @@ -0,0 +1,5 @@ +--- +title: Fix serialization of LegacyDiffNote +merge_request: +author: +type: fixed diff --git a/lib/api/entities.rb b/lib/api/entities.rb index b256c33c631..3f3a95ea8e6 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -701,7 +701,7 @@ module API expose :system?, as: :system expose :noteable_id, :noteable_type - expose :position, if: ->(note, options) { note.diff_note? } do |note| + expose :position, if: ->(note, options) { note.is_a?(DiffNote) } do |note| note.position.to_h end diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 9fdc3e616a6..6844ed8aa4a 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -39,6 +39,7 @@ FactoryBot.define do factory :legacy_diff_note_on_merge_request, traits: [:on_merge_request, :legacy_diff_note], class: LegacyDiffNote do association :project, :repository + position '' end factory :diff_note_on_merge_request, traits: [:on_merge_request], class: DiffNote do |