Commit 94454101 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'jramsay-5457-create-project-permissions' into 'master'

Move group create project permissions to Starter

Closes #5457

See merge request gitlab-org/gitlab-ee!5148
parents 360fa69f d2c6111b
...@@ -154,7 +154,8 @@ There are two different ways to add a new project to a group: ...@@ -154,7 +154,8 @@ There are two different ways to add a new project to a group:
### Default project creation level ### Default project creation level
> Introduced in [GitLab Premium](https://about.gitlab.com/products/) 10.5. > [Introduced][ee-2534] in [GitLab Premium][ee] 10.5.
> Brought to [GitLab Starter][ee] in 10.7.
Group owners or administrators can set an option that will give users with the Group owners or administrators can set an option that will give users with the
Developer role the ability to create projects under groups. Developer role the ability to create projects under groups.
...@@ -316,3 +317,4 @@ you have an overview of the contributions (pushes, merge requests, ...@@ -316,3 +317,4 @@ you have an overview of the contributions (pushes, merge requests,
and issues) performed my your group members. and issues) performed my your group members.
[ee]: https://about.gitlab.com/products/ [ee]: https://about.gitlab.com/products/
[ee-2534]: https://gitlab.com/gitlab-org/gitlab-ee/issues/2534
...@@ -26,6 +26,7 @@ class License < ActiveRecord::Base ...@@ -26,6 +26,7 @@ class License < ActiveRecord::Base
multiple_issue_assignees multiple_issue_assignees
multiple_project_issue_boards multiple_project_issue_boards
push_rules push_rules
project_creation_level
protected_refs_for_users protected_refs_for_users
related_issues related_issues
repository_mirrors repository_mirrors
...@@ -53,7 +54,6 @@ class License < ActiveRecord::Base ...@@ -53,7 +54,6 @@ class License < ActiveRecord::Base
variable_environment_scope variable_environment_scope
reject_unsigned_commits reject_unsigned_commits
commit_committer_check commit_committer_check
project_creation_level
external_authorization_service external_authorization_service
ci_cd_projects ci_cd_projects
].freeze ].freeze
......
---
title: Move default group project creation level to Starter
merge_request: 5148
author:
type: other
...@@ -245,6 +245,10 @@ describe GroupPolicy do ...@@ -245,6 +245,10 @@ describe GroupPolicy do
end end
context 'project_creation_level disabled' do context 'project_creation_level disabled' do
before do
stub_licensed_features(project_creation_level: false)
end
context 'when group has no project creation level set' do context 'when group has no project creation level set' do
let(:group) { create(:group, project_creation_level: nil) } let(:group) { create(:group, project_creation_level: nil) }
......
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