Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-02-03 13:29:56 +0300
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-02-16 11:19:02 +0300
commit1a0e54b32d43e2a3de88c20037bd167b1f8563d6 (patch)
tree21b9a0fe8cc36425b105c5065ec951ea390a177e /app/services/groups
parent297dc70158f905fef4557d1ee6510bcf459a08a9 (diff)
Add tests for Mattermost team creation
Diffstat (limited to 'app/services/groups')
-rw-r--r--app/services/groups/create_service.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index 209fd15f481..aabd3c4bd05 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -5,6 +5,8 @@ module Groups
end
def execute
+ create_chat_team = params.delete(:create_chat_team)
+
@group = Group.new(params)
unless Gitlab::VisibilityLevel.allowed_for?(current_user, params[:visibility_level])
@@ -23,7 +25,7 @@ module Groups
@group.save
@group.add_owner(current_user)
- if params[:create_chat_team] && Gitlab.config.mattermost.enabled
+ if create_chat_team && Gitlab.config.mattermost.enabled
Mattermost::CreateTeamWorker.perform_async(@group.id, current_user.id)
end