From e962ffbc90b797cc9f1eb922e918c093dac7d4a1 Mon Sep 17 00:00:00 2001
From: Fabio Papa <fabtheman@gmail.com>
Date: Fri, 28 Jun 2019 16:12:54 -0700
Subject: Make maintainers the default setting for creating subgroups

---
 app/models/group.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/group.rb b/app/models/group.rb
index 3f80c1373f1..8f39c3a658f 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
@@ -416,10 +418,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
@@ -449,4 +447,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
-- 
cgit v1.2.1