diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-07-21 18:45:12 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-07-21 18:45:12 +0100 |
| commit | e4391c7190fcebd37e49db447b22b1081dca9741 (patch) | |
| tree | 6ae62e5833e6a04128ff39ae11d5cab31db706dc /app/controllers/projects/application_controller.rb | |
| parent | 2209426f7ba1a0c40b09e5b67ac3b48fd15f7b99 (diff) | |
| download | gitlab-ce-e4391c7190fcebd37e49db447b22b1081dca9741.tar.gz | |
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 95de3a44641..221e01b415a 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -22,6 +22,7 @@ class Projects::ApplicationController < ApplicationController def project return @project if @project + return nil unless params[:project_id] || params[:id] path = File.join(params[:namespace_id], params[:project_id] || params[:id]) auth_proc = ->(project) { !project.pending_delete? } |