diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2019-05-13 11:50:23 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2019-05-15 13:36:50 +0300 |
| commit | bedb9a3e6d644e4d8c71f92038ce31c9383e0887 (patch) | |
| tree | 81f13a4061a2bd00518a975e3e0b11c4c0a3bab3 /app/controllers/projects/application_controller.rb | |
| parent | 224c01033fa8eafe53dd1b1d2dfdd90605a000bb (diff) | |
Avoid passing not_found_or_authorized_proc around
Since this needs to be called on every find_routable!(Project, ...
we can instead move it to a RoutableActions check.
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 781eac7f080..80e4f54bbf4 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -3,7 +3,6 @@ class Projects::ApplicationController < ApplicationController include CookiesHelper include RoutableActions - include ProjectUnauthorized include ChecksCollaboration skip_before_action :authenticate_user! @@ -22,7 +21,7 @@ class Projects::ApplicationController < ApplicationController path = File.join(params[:namespace_id], params[:project_id] || params[:id]) auth_proc = ->(project) { !project.pending_delete? } - @project = find_routable!(Project, path, extra_authorization_proc: auth_proc, not_found_or_authorized_proc: project_unauthorized_proc) + @project = find_routable!(Project, path, extra_authorization_proc: auth_proc) end def build_canonical_path(project) |