summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 11:31:08 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 14:58:28 -0200
commit355389d065216739a2b8e8150a1a569c410f4ff6 (patch)
tree109be64911e0b99f220a2cee530ab3d05f15129c /app/controllers
parentaa78148901cd3877936bc2afcea9c329077bf951 (diff)
downloadgitlab-ce-355389d065216739a2b8e8150a1a569c410f4ff6.tar.gz
Disable subscribing to group-level labels
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/groups/labels_controller.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb
index 0a3dee5ce39..29528b2cfaa 100644
--- a/app/controllers/groups/labels_controller.rb
+++ b/app/controllers/groups/labels_controller.rb
@@ -1,7 +1,5 @@
class Groups::LabelsController < Groups::ApplicationController
- include ToggleSubscriptionAction
-
- before_action :label, only: [:edit, :update, :destroy, :toggle_subscription]
+ before_action :label, only: [:edit, :update, :destroy]
before_action :authorize_admin_labels!, only: [:new, :create, :edit, :update, :destroy]
before_action :save_previous_label_path, only: [:edit]
@@ -71,7 +69,6 @@ class Groups::LabelsController < Groups::ApplicationController
def label
@label ||= @group.labels.find(params[:id])
end
- alias_method :subscribable_resource, :label
def label_params
params.require(:label).permit(:title, :description, :color)