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
Léo-Paul Géneau
gitlab-ce
Commits
7c072c76
Commit
7c072c76
authored
Jun 06, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix importer for GitHub comments on diff
Fix comments on diff after LegacyDiffNote was extracted from Note
parent
ac4e3e8c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/github_import/comment_formatter.rb
lib/gitlab/github_import/comment_formatter.rb
+5
-0
spec/lib/gitlab/github_import/comment_formatter_spec.rb
spec/lib/gitlab/github_import/comment_formatter_spec.rb
+2
-0
No files found.
CHANGELOG
View file @
7c072c76
...
@@ -45,6 +45,7 @@ v 8.8.4 (unreleased)
...
@@ -45,6 +45,7 @@ v 8.8.4 (unreleased)
- Fix todos page throwing errors when you have a project pending deletion
- Fix todos page throwing errors when you have a project pending deletion
- Reduce number of SQL queries when rendering user references
- Reduce number of SQL queries when rendering user references
- Upgrade to jQuery 2
- Upgrade to jQuery 2
- Fix importer for GitHub comments on diff
v 8.8.3
v 8.8.3
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
...
...
lib/gitlab/github_import/comment_formatter.rb
View file @
7c072c76
...
@@ -8,6 +8,7 @@ module Gitlab
...
@@ -8,6 +8,7 @@ module Gitlab
commit_id:
raw_data
.
commit_id
,
commit_id:
raw_data
.
commit_id
,
line_code:
line_code
,
line_code:
line_code
,
author_id:
author_id
,
author_id:
author_id
,
type:
type
,
created_at:
raw_data
.
created_at
,
created_at:
raw_data
.
created_at
,
updated_at:
raw_data
.
updated_at
updated_at:
raw_data
.
updated_at
}
}
...
@@ -53,6 +54,10 @@ module Gitlab
...
@@ -53,6 +54,10 @@ module Gitlab
def
note
def
note
formatter
.
author_line
(
author
)
+
body
formatter
.
author_line
(
author
)
+
body
end
end
def
type
'LegacyDiffNote'
if
on_diff?
end
end
end
end
end
end
end
spec/lib/gitlab/github_import/comment_formatter_spec.rb
View file @
7c072c76
...
@@ -29,6 +29,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
...
@@ -29,6 +29,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
commit_id:
nil
,
commit_id:
nil
,
line_code:
nil
,
line_code:
nil
,
author_id:
project
.
creator_id
,
author_id:
project
.
creator_id
,
type:
nil
,
created_at:
created_at
,
created_at:
created_at
,
updated_at:
updated_at
updated_at:
updated_at
}
}
...
@@ -56,6 +57,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
...
@@ -56,6 +57,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
commit_id:
'6dcb09b5b57875f334f61aebed695e2e4193db5e'
,
commit_id:
'6dcb09b5b57875f334f61aebed695e2e4193db5e'
,
line_code:
'ce1be0ff4065a6e9415095c95f25f47a633cef2b_4_3'
,
line_code:
'ce1be0ff4065a6e9415095c95f25f47a633cef2b_4_3'
,
author_id:
project
.
creator_id
,
author_id:
project
.
creator_id
,
type:
'LegacyDiffNote'
,
created_at:
created_at
,
created_at:
created_at
,
updated_at:
updated_at
updated_at:
updated_at
}
}
...
...
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