diff --git a/CHANGELOG b/CHANGELOG index 025fb3d6fed53d0a54e2c09685839ca48dccd53b..06ceaae4ca064d1000bd332e9bfb59201c3e77ed 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb index 46d40f75be6b93fa503ec47e9b4253dd555c87ed..cc49d6aac5cb7c965fdc8a3bbbba8e93056da3f6 100644 --- a/lib/gitlab/gitlab_import/importer.rb +++ b/lib/gitlab/gitlab_import/importer.rb @@ -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 diff --git a/spec/lib/gitlab/gitlab_import/importer_spec.rb b/spec/lib/gitlab/gitlab_import/importer_spec.rb index d3f1deb383765b221f5f5faaeb60a23d1d5d052e..9b499b593d32ced37b99ab25a72b56699ac2c1df 100644 --- a/spec/lib/gitlab/gitlab_import/importer_spec.rb +++ b/spec/lib/gitlab/gitlab_import/importer_spec.rb @@ -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 }