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
Tatuya Kamada
gitlab-ce
Commits
3111d6a9
Commit
3111d6a9
authored
Sep 02, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed gitlab.com importer missing confidential attribute
parent
8aa025bb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/gitlab_import/importer.rb
lib/gitlab/gitlab_import/importer.rb
+2
-1
spec/lib/gitlab/gitlab_import/importer_spec.rb
spec/lib/gitlab/gitlab_import/importer_spec.rb
+2
-0
No files found.
CHANGELOG
View file @
3111d6a9
...
@@ -87,6 +87,7 @@ v 8.11.5 (unreleased)
...
@@ -87,6 +87,7 @@ v 8.11.5 (unreleased)
- Fix member expiration date picker after update
- Fix member expiration date picker after update
- Fix suggested colors options for new labels in the admin area. !6138
- Fix suggested colors options for new labels in the admin area. !6138
- Fix GitLab import button
- Fix GitLab import button
- Fix confidential issues being exposed as public using gitlab.com export
v 8.11.4
v 8.11.4
- Fix resolving conflicts on forks. !6082
- Fix resolving conflicts on forks. !6082
...
...
lib/gitlab/gitlab_import/importer.rb
View file @
3111d6a9
...
@@ -41,7 +41,8 @@ module Gitlab
...
@@ -41,7 +41,8 @@ module Gitlab
title:
issue
[
"title"
],
title:
issue
[
"title"
],
state:
issue
[
"state"
],
state:
issue
[
"state"
],
updated_at:
issue
[
"updated_at"
],
updated_at:
issue
[
"updated_at"
],
author_id:
gl_user_id
(
project
,
issue
[
"author"
][
"id"
])
author_id:
gl_user_id
(
project
,
issue
[
"author"
][
"id"
]),
confidential:
issue
[
"confidential"
]
)
)
end
end
end
end
...
...
spec/lib/gitlab/gitlab_import/importer_spec.rb
View file @
3111d6a9
...
@@ -13,6 +13,7 @@ describe Gitlab::GitlabImport::Importer, lib: true do
...
@@ -13,6 +13,7 @@ describe Gitlab::GitlabImport::Importer, lib: true do
'title'
=>
'Issue'
,
'title'
=>
'Issue'
,
'description'
=>
'Lorem ipsum'
,
'description'
=>
'Lorem ipsum'
,
'state'
=>
'opened'
,
'state'
=>
'opened'
,
'confidential'
=>
true
,
'author'
=>
{
'author'
=>
{
'id'
=>
283999
,
'id'
=>
283999
,
'name'
=>
'John Doe'
'name'
=>
'John Doe'
...
@@ -34,6 +35,7 @@ describe Gitlab::GitlabImport::Importer, lib: true do
...
@@ -34,6 +35,7 @@ describe Gitlab::GitlabImport::Importer, lib: true do
title:
'Issue'
,
title:
'Issue'
,
description:
"*Created by: John Doe*
\n\n
Lorem ipsum"
,
description:
"*Created by: John Doe*
\n\n
Lorem ipsum"
,
state:
'opened'
,
state:
'opened'
,
confidential:
true
,
author_id:
project
.
creator_id
author_id:
project
.
creator_id
}
}
...
...
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