From 54ec7e959900493b6e9174bf4dfe09ed0afd1e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 1 Mar 2016 17:33:13 +0100 Subject: Improving the original label-subscribing implementation 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription --- app/controllers/projects/issues_controller.rb | 2 ++ app/controllers/projects/labels_controller.rb | 2 ++ app/controllers/projects/merge_requests_controller.rb | 2 ++ 3 files changed, 6 insertions(+) (limited to 'app/controllers') diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 67faa1e4437..24a862814b3 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -111,6 +111,8 @@ class Projects::IssuesController < Projects::ApplicationController end def toggle_subscription + return unless current_user + @issue.toggle_subscription(current_user) render nothing: true diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index d0334c37b67..e4dea6b065a 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -61,6 +61,8 @@ class Projects::LabelsController < Projects::ApplicationController end def toggle_subscription + return unless current_user + @label.toggle_subscription(current_user) render nothing: true end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 03ba289eb94..954ee55a211 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -234,6 +234,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def toggle_subscription + return unless current_user + @merge_request.toggle_subscription(current_user) render nothing: true -- cgit v1.2.1