Commit 535ce118 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

parents 43d6328f 19f5304a
......@@ -111,6 +111,7 @@ v 8.11.5 (unreleased)
- Fix suggested colors options for new labels in the admin area. !6138
- Fix GitLab import button
- Remove gitorious from import_sources
- Fix confidential issues being exposed as public using gitlab.com export
v 8.11.4
- Fix resolving conflicts on forks. !6082
......
......@@ -41,7 +41,8 @@ module Gitlab
title: issue["title"],
state: issue["state"],
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
......
......@@ -13,6 +13,7 @@ describe Gitlab::GitlabImport::Importer, lib: true do
'title' => 'Issue',
'description' => 'Lorem ipsum',
'state' => 'opened',
'confidential' => true,
'author' => {
'id' => 283999,
'name' => 'John Doe'
......@@ -34,6 +35,7 @@ describe Gitlab::GitlabImport::Importer, lib: true do
title: 'Issue',
description: "*Created by: John Doe*\n\nLorem ipsum",
state: 'opened',
confidential: true,
author_id: project.creator_id
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment