diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-03 11:09:38 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-17 15:10:13 -0200 |
| commit | b3249bc28faecd1774558ec6f8ecc32f89c416ae (patch) | |
| tree | 19d8321d4a18f1adc3776b5b7e51dd32fa4f5ff8 | |
| parent | 4a29fde577a7d5d7c46ffff7c5feb79be23cdaa8 (diff) | |
| download | gitlab-ce-b3249bc28faecd1774558ec6f8ecc32f89c416ae.tar.gz | |
Use @project as default on ToggleSubscriptionAction concern
4 files changed, 1 insertions, 13 deletions
diff --git a/app/controllers/concerns/toggle_subscription_action.rb b/app/controllers/concerns/toggle_subscription_action.rb index 3be89dc5024..92cb534343e 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 460a8ae6395..3f1a1d1c511 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 a65adf13568..824ed7be73e 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 0eda3c3c80c..dff0213411c 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 |