diff options
author | Fabio Papa <fabtheman@gmail.com> | 2019-06-28 16:12:54 -0700 |
---|---|---|
committer | Fabio Papa <fabtheman@gmail.com> | 2019-07-01 14:10:52 -0700 |
commit | a781822664a4f9c8edffaa1d75fec856b13bbb1a (patch) | |
tree | fa299ae172bf0e02869892fbf8461f4aaf06dc81 | |
parent | 23c549d4a38efc15a54ff7cc57e38a9aefb632f8 (diff) | |
download | gitlab-ce-a781822664a4f9c8edffaa1d75fec856b13bbb1a.tar.gz |
Make maintainers the default setting for creating subgroups
-rw-r--r-- | app/models/group.rb | 10 | ||||
-rw-r--r-- | spec/models/group_spec.rb | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 44bc6c8288a..47e7bf34ec8 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -58,6 +58,8 @@ class Group < Namespace add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:groups_tokens_optional_encryption, default_enabled: true) ? :optional : :required } + before_create :default_subgroup_creation_level_to_maintainers + after_create :post_create_hook after_destroy :post_destroy_hook after_save :update_two_factor_requirement @@ -414,10 +416,6 @@ class Group < Namespace super || ::Gitlab::CurrentSettings.default_project_creation end - def subgroup_creation_level - super || ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS - end - private def update_two_factor_requirement @@ -447,4 +445,8 @@ class Group < Namespace errors.add(:visibility_level, "#{visibility} is not allowed since there are sub-groups with higher visibility.") end + + def default_subgroup_creation_level_to_maintainers + self.subgroup_creation_level = ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS + end end diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 470ce65707d..9ae18d7bab7 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -994,4 +994,12 @@ describe Group do expect(group.project_creation_level).to eq(Gitlab::CurrentSettings.default_project_creation) end end + + describe 'subgroup_creation_level' do + it 'defaults to maintainers' do + group = create (:group) + + expect(group.subgroup_creation_level).to eq(Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) + end + end end |