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
a8682582
Commit
a8682582
authored
May 13, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update json and fix notes issue
parent
25a1c654
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5406 additions
and
345 deletions
+5406
-345
lib/gitlab/import_export/relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+2
-2
spec/lib/gitlab/import_export/project.json
spec/lib/gitlab/import_export/project.json
+5404
-343
No files found.
lib/gitlab/import_export/relation_factory.rb
View file @
a8682582
...
@@ -28,12 +28,12 @@ module Gitlab
...
@@ -28,12 +28,12 @@ module Gitlab
end
end
def
update_missing_author
(
relation_hash
,
members_map
)
def
update_missing_author
(
relation_hash
,
members_map
)
old_author_id
=
relation_hash
[
'author_id'
]
.
dup
old_author_id
=
relation_hash
[
'author_id'
]
relation_hash
[
'author_id'
]
=
members_map
.
map
[
old_author_id
]
relation_hash
[
'author_id'
]
=
members_map
.
map
[
old_author_id
]
return
unless
members_map
.
note_member_list
.
include?
(
old_author_id
)
return
unless
members_map
.
note_member_list
.
include?
(
old_author_id
)
relation_hash
[
'note'
]
=
(
'*Blank note*'
)
if
relation_hash
[
'note'
].
blank?
relation_hash
[
'note'
]
=
(
'*Blank note*'
)
if
relation_hash
[
'note'
].
blank?
relation_hash
[
'note'
]
.
join
(
missing_author_note
(
relation_hash
[
'updated_at'
],
relation_hash
[
'note'
]
+=
(
missing_author_note
(
relation_hash
[
'updated_at'
],
relation_hash
[
'author'
][
'name'
]))
relation_hash
[
'author'
][
'name'
]))
relation_hash
.
delete
(
'author'
)
relation_hash
.
delete
(
'author'
)
end
end
...
...
spec/lib/gitlab/import_export/project.json
View file @
a8682582
This diff is collapsed.
Click to expand it.
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