diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:13:26 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:16:16 +0100 |
| commit | 59064aeeef8562a87d4d03efa9b11012a007e261 (patch) | |
| tree | 1ecb34e1355a4eb714615b2a9c2727155e8f3ec9 /app/controllers/projects/issues_controller.rb | |
| parent | aaf4434b0e24da916d4392aa9cd001cdb8e0c7dc (diff) | |
| parent | bc590ce63bd2f1af5545b648e6d028a557e7c792 (diff) | |
| download | gitlab-ce-4009-external-users.tar.gz | |
Merge branch 'master' into 4009-external-users4009-external-users
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 67faa1e4437..b0a03ee45cc 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -1,6 +1,8 @@ class Projects::IssuesController < Projects::ApplicationController + include ToggleSubscriptionAction + before_action :module_enabled - before_action :issue, only: [:edit, :update, :show, :toggle_subscription] + before_action :issue, only: [:edit, :update, :show] # Allow read any issue before_action :authorize_read_issue! @@ -110,12 +112,6 @@ class Projects::IssuesController < Projects::ApplicationController redirect_back_or_default(default: { action: 'index' }, options: { notice: "#{result[:count]} issues updated" }) end - def toggle_subscription - @issue.toggle_subscription(current_user) - - render nothing: true - end - def closed_by_merge_requests @closed_by_merge_requests ||= @issue.closed_by_merge_requests(current_user) end @@ -129,6 +125,7 @@ class Projects::IssuesController < Projects::ApplicationController redirect_old end end + alias_method :subscribable_resource, :issue def authorize_update_issue! return render_404 unless can?(current_user, :update_issue, @issue) |