summaryrefslogtreecommitdiff
path: root/app/controllers/groups
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-02-06 11:58:03 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-02-06 11:58:03 +0000
commit1a430836e2413caf61cb1325c2835c5ad390202b (patch)
tree31c0cad4d04e4bc758ef72fd7760c26b4fa8d835 /app/controllers/groups
parent9483cbab26ad239c7a102f887177aaf354c9d13c (diff)
parentcf9b932f78be297ee91de048e634cfa83d91ef83 (diff)
downloadgitlab-ce-1a430836e2413caf61cb1325c2835c5ad390202b.tar.gz
Merge branch '39550-group-labels-redesign' into 'master'
Resolve "Group label list page redesign" Closes #39550 See merge request gitlab-org/gitlab-ce!16592
Diffstat (limited to 'app/controllers/groups')
-rw-r--r--app/controllers/groups/labels_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb
index dda59262483..f3a9e591c3e 100644
--- a/app/controllers/groups/labels_controller.rb
+++ b/app/controllers/groups/labels_controller.rb
@@ -54,7 +54,7 @@ class Groups::LabelsController < Groups::ApplicationController
respond_to do |format|
format.html do
- redirect_to group_labels_path(@group), status: 302, notice: 'Label was removed'
+ redirect_to group_labels_path(@group), status: 302, notice: "#{@label.name} deleted permanently"
end
format.js
end