Use @project as default on ToggleSubscriptionAction concern

parent 4a29fde5
...@@ -12,7 +12,7 @@ module ToggleSubscriptionAction ...@@ -12,7 +12,7 @@ module ToggleSubscriptionAction
private private
def subscribable_project def subscribable_project
raise NotImplementedError @project || raise(NotImplementedError)
end end
def subscribable_resource def subscribable_resource
......
...@@ -169,10 +169,6 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -169,10 +169,6 @@ class Projects::IssuesController < Projects::ApplicationController
alias_method :awardable, :issue alias_method :awardable, :issue
alias_method :spammable, :issue alias_method :spammable, :issue
def subscribable_project
issue.project
end
def authorize_read_issue! def authorize_read_issue!
return render_404 unless can?(current_user, :read_issue, @issue) return render_404 unless can?(current_user, :read_issue, @issue)
end end
......
...@@ -128,10 +128,6 @@ class Projects::LabelsController < Projects::ApplicationController ...@@ -128,10 +128,6 @@ class Projects::LabelsController < Projects::ApplicationController
@available_labels.find(params[:id]) @available_labels.find(params[:id])
end end
def subscribable_project
@project
end
def find_labels def find_labels
@available_labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute @available_labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute
end end
......
...@@ -473,10 +473,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -473,10 +473,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
alias_method :issuable, :merge_request alias_method :issuable, :merge_request
alias_method :awardable, :merge_request alias_method :awardable, :merge_request
def subscribable_project
merge_request.project
end
def authorize_update_merge_request! def authorize_update_merge_request!
return render_404 unless can?(current_user, :update_merge_request, @merge_request) return render_404 unless can?(current_user, :update_merge_request, @merge_request)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment