Commit 8ff41740 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents f1aa62e3 7e1b5f42
......@@ -73,7 +73,7 @@ class Project < ActiveRecord::Base
delegate :no_import?, to: :import_state, allow_nil: true
default_value_for :archived, false
default_value_for :visibility_level, gitlab_config_features.visibility_level
default_value_for(:visibility_level) { Gitlab::CurrentSettings.default_project_visibility }
default_value_for :resolve_outdated_diff_discussions, false
default_value_for :container_registry_enabled, gitlab_config_features.container_registry
default_value_for(:repository_storage) { Gitlab::CurrentSettings.pick_repository_storage }
......
---
title: Fix default visibility_level for new projects
merge_request: 24120
author: Fabian Schneider @fabsrc
type: fixed
......@@ -1541,6 +1541,24 @@ describe Project do
end
end
describe '#visibility_level' do
let(:project) { build(:project) }
subject { project.visibility_level }
context 'by default' do
it { is_expected.to eq(Gitlab::VisibilityLevel::PRIVATE) }
end
context 'when set to INTERNAL in application settings' do
before do
stub_application_setting(default_project_visibility: Gitlab::VisibilityLevel::INTERNAL)
end
it { is_expected.to eq(Gitlab::VisibilityLevel::INTERNAL) }
end
end
describe '#visibility_level_allowed?' do
let(:project) { create(:project, :internal) }
......
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