Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
e938d241
Commit
e938d241
authored
May 17, 2019
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include type to notes import / export
parent
f7ebea04
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
changelogs/unreleased/49517-fix-notes-import-export.yml
changelogs/unreleased/49517-fix-notes-import-export.yml
+5
-0
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+2
-0
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+5
-2
No files found.
changelogs/unreleased/49517-fix-notes-import-export.yml
0 → 100644
View file @
e938d241
---
title
:
Fix diff notes and discussion notes being exported as regular notes
merge_request
:
28401
author
:
type
:
fixed
lib/gitlab/import_export/import_export.yml
View file @
e938d241
...
@@ -176,6 +176,8 @@ excluded_attributes:
...
@@ -176,6 +176,8 @@ excluded_attributes:
-
:enabled
-
:enabled
methods
:
methods
:
notes
:
-
:type
labels
:
labels
:
-
:type
-
:type
label
:
label
:
...
...
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
View file @
e938d241
...
@@ -91,7 +91,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
...
@@ -91,7 +91,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
end
end
it
'has issue comments'
do
it
'has issue comments'
do
expect
(
saved_project_json
[
'issues'
].
first
[
'notes'
]).
not_to
be_empty
notes
=
saved_project_json
[
'issues'
].
first
[
'notes'
]
expect
(
notes
).
not_to
be_empty
expect
(
notes
.
first
[
'type'
]).
to
eq
(
'DiscussionNote'
)
end
end
it
'has issue assignees'
do
it
'has issue assignees'
do
...
@@ -299,7 +302,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
...
@@ -299,7 +302,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
create
(
:commit_status
,
project:
project
,
pipeline:
ci_build
.
pipeline
)
create
(
:commit_status
,
project:
project
,
pipeline:
ci_build
.
pipeline
)
create
(
:milestone
,
project:
project
)
create
(
:milestone
,
project:
project
)
create
(
:note
,
noteable:
issue
,
project:
project
)
create
(
:
discussion_
note
,
noteable:
issue
,
project:
project
)
create
(
:note
,
noteable:
merge_request
,
project:
project
)
create
(
:note
,
noteable:
merge_request
,
project:
project
)
create
(
:note
,
noteable:
snippet
,
project:
project
)
create
(
:note
,
noteable:
snippet
,
project:
project
)
create
(
:note_on_commit
,
create
(
:note_on_commit
,
...
...
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