summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-02-01 17:27:43 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-02-01 17:27:43 +0000
commit0cc5e956fcb9393829e537a20be8da89a275ec1d (patch)
tree4f9fda7494bf42c5e8c5026f9297bb1309112318
parent8ff54db11d1dfd5532686ff62708748d9f6e0ed5 (diff)
parent073684e7a554b4e4b189a616b961f0d7ef7c1432 (diff)
downloadgitlab-ce-dastor-update-AWS-instructions.tar.gz
Merge branch 'ce-reduce-diff-in-groups-create_service' into 'master'dastor-update-AWS-instructions
Reduce diff with EE in Groups::CreateService See merge request gitlab-org/gitlab-ce!24871
-rw-r--r--app/services/groups/create_service.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index 24d8400c625..55a3b9fa7b1 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -10,6 +10,8 @@ module Groups
def execute
@group = Group.new(params)
+ after_build_hook(@group, params)
+
unless can_use_visibility_level? && can_create_group?
return @group
end
@@ -30,6 +32,10 @@ module Groups
private
+ def after_build_hook(group, params)
+ # overriden in EE
+ end
+
def create_chat_team?
Gitlab.config.mattermost.enabled && @chat_team && group.chat_team.nil?
end