Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
53aa533bc9df
Commit
03a39ec1
authored
Jul 18, 2018
by
Jan Provaznik
Committed by
Sean McGivern
Jul 18, 2018
Browse files
Fix serialization of LegacyDiffNote
parent
aa88dd44317b
Changes
3
Hide whitespace changes
Inline
Side-by-side
changelogs/unreleased/fix-diff-note.yml
0 → 100644
View file @
53aa533b
---
title
:
Fix serialization of LegacyDiffNote
merge_request
:
author
:
type
:
fixed
lib/api/entities.rb
View file @
53aa533b
...
...
@@ -701,7 +701,7 @@ class Note < Grape::Entity
expose
:system?
,
as: :system
expose
:noteable_id
,
:noteable_type
expose
:position
,
if:
->
(
note
,
options
)
{
note
.
d
iff
_n
ote
?
}
do
|
note
|
expose
:position
,
if:
->
(
note
,
options
)
{
note
.
is_a?
(
D
iff
N
ote
)
}
do
|
note
|
note
.
position
.
to_h
end
...
...
spec/factories/notes.rb
View file @
53aa533b
...
...
@@ -39,6 +39,7 @@
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment