diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-06 10:54:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-06 10:54:43 +0000 |
| commit | 45444c8e3007d2753349dca4d2c81f7ec90da278 (patch) | |
| tree | 95c0e6b0501eaf412163696baae89add7b42ba1e /lib | |
| parent | f4b03f0992d39db9f9f77798cb285d732c352074 (diff) | |
| parent | c5e44dc5d1a98a92362b93c30342ebf1f972061c (diff) | |
| download | gitlab-ce-45444c8e3007d2753349dca4d2c81f7ec90da278.tar.gz | |
Merge branch '47189-github_import_visibility' into 'master'
Use Github repo visibility during import while respecting restricted visibility levels
Closes #47189
See merge request gitlab-org/gitlab-ce!19450
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/legacy_github_import/project_creator.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/legacy_github_import/project_creator.rb b/lib/gitlab/legacy_github_import/project_creator.rb index 3ce245a8050..5e96eb16754 100644 --- a/lib/gitlab/legacy_github_import/project_creator.rb +++ b/lib/gitlab/legacy_github_import/project_creator.rb @@ -35,7 +35,10 @@ module Gitlab end def visibility_level - repo.private ? Gitlab::VisibilityLevel::PRIVATE : Gitlab::CurrentSettings.default_project_visibility + visibility_level = repo.private ? Gitlab::VisibilityLevel::PRIVATE : Gitlab::VisibilityLevel::PUBLIC + visibility_level = Gitlab::CurrentSettings.default_project_visibility if Gitlab::CurrentSettings.restricted_visibility_levels.include?(visibility_level) + + visibility_level end # |