diff --git a/app/controllers/concerns/toggle_subscription_action.rb b/app/controllers/concerns/toggle_subscription_action.rb index 3be89dc5024a8e1b15dd88359bcdeafb4529e21b..92cb534343e23701a0deeee5cb6f97d7dd7dd397 100644 --- a/app/controllers/concerns/toggle_subscription_action.rb +++ b/app/controllers/concerns/toggle_subscription_action.rb @@ -12,7 +12,7 @@ module ToggleSubscriptionAction private def subscribable_project - raise NotImplementedError + @project || raise(NotImplementedError) end def subscribable_resource diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 460a8ae639516fda9de6850d0242af9b02c958a5..3f1a1d1c51167c0181a0f099f329b909bb37bd02 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -169,10 +169,6 @@ class Projects::IssuesController < Projects::ApplicationController alias_method :awardable, :issue alias_method :spammable, :issue - def subscribable_project - issue.project - end - def authorize_read_issue! return render_404 unless can?(current_user, :read_issue, @issue) end diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index a65adf13568a1ef8161f36685f161c548c93fe71..824ed7be73e0754b991af3344041b031bb497ea7 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -128,10 +128,6 @@ class Projects::LabelsController < Projects::ApplicationController @available_labels.find(params[:id]) end - def subscribable_project - @project - end - def find_labels @available_labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 0eda3c3c80cb282a7521909eff4388bf6a080bf0..dff0213411c440e58933be7bbbd8944aad052f31 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -473,10 +473,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController alias_method :issuable, :merge_request alias_method :awardable, :merge_request - def subscribable_project - merge_request.project - end - def authorize_update_merge_request! return render_404 unless can?(current_user, :update_merge_request, @merge_request) end