summaryrefslogtreecommitdiff
path: root/app/controllers/groups_controller.rb
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-03-01 20:34:29 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-03-02 10:21:29 +0100
commit52c4a7866ed010d8db67e5ca976d8c73d4084784 (patch)
treea1cbb2d3910f9433e23dec22cc0f8c94c2e8675c /app/controllers/groups_controller.rb
parentf6247600a3f5d500952b0ba32e6915a2d045e392 (diff)
downloadgitlab-ce-52c4a7866ed010d8db67e5ca976d8c73d4084784.tar.gz
Improve UX
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 5b1898b0ee1..5a6ba3f2054 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -32,7 +32,13 @@ class GroupsController < Groups::ApplicationController
@group = Groups::CreateService.new(current_user, group_params).execute
if @group.persisted?
- redirect_to @group, notice: "Group '#{@group.name}' was successfully created."
+ notice = if @group.chat_team.present?
+ "Group '#{@group.name}' and its Mattermost team were successfully created."
+ else
+ "Group '#{@group.name}' was successfully created."
+ end
+
+ redirect_to @group, notice: notice
else
render action: "new"
end