diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-14 11:33:14 +0200 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-05-28 03:14:43 -0700 |
| commit | be613de2cfa96c7a17f734e532ba6ada0d81c7fe (patch) | |
| tree | 2c318719a940e2a1ecdc33ff0bb0305bb3930958 /app | |
| parent | f9bb9151b595fdc1afc1742bb51c816965908f53 (diff) | |
| download | gitlab-ce-be613de2cfa96c7a17f734e532ba6ada0d81c7fe.tar.gz | |
Project#show on projects pending deletion will 404zj-race-condition-pending-delete
fixes #17508
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index be872a93fee..776ba92c9ab 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -26,7 +26,7 @@ class Projects::ApplicationController < ApplicationController project_path = "#{namespace}/#{id}" @project = Project.find_with_namespace(project_path) - if @project && can?(current_user, :read_project, @project) + if can?(current_user, :read_project, @project) && !@project.pending_delete? if @project.path_with_namespace != project_path redirect_to request.original_url.gsub(project_path, @project.path_with_namespace) end |