Commit 0cc5e956 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'ce-reduce-diff-in-groups-create_service' into 'master'

Reduce diff with EE in Groups::CreateService

See merge request gitlab-org/gitlab-ce!24871
parents 8ff54db1 073684e7
...@@ -10,6 +10,8 @@ module Groups ...@@ -10,6 +10,8 @@ module Groups
def execute def execute
@group = Group.new(params) @group = Group.new(params)
after_build_hook(@group, params)
unless can_use_visibility_level? && can_create_group? unless can_use_visibility_level? && can_create_group?
return @group return @group
end end
...@@ -30,6 +32,10 @@ module Groups ...@@ -30,6 +32,10 @@ module Groups
private private
def after_build_hook(group, params)
# overriden in EE
end
def create_chat_team? def create_chat_team?
Gitlab.config.mattermost.enabled && @chat_team && group.chat_team.nil? Gitlab.config.mattermost.enabled && @chat_team && group.chat_team.nil?
end end
......
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