diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-27 15:06:40 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-27 15:06:40 +0100 |
| commit | 740feeec772565b0734cae816b31dcb47e5f4492 (patch) | |
| tree | 600cac255cb3ceeb843ec03c6e84c44168964264 /app/controllers/application_controller.rb | |
| parent | 7851a292a1fc7da3cd2d1140cd40f35009a9c082 (diff) | |
| parent | 940d68cc4c349b574166b010666a36cf25f485b7 (diff) | |
| download | gitlab-ce-740feeec772565b0734cae816b31dcb47e5f4492.tar.gz | |
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 865deb7d46a..1b0609e279e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -124,7 +124,6 @@ class ApplicationController < ActionController::Base project_path = "#{namespace}/#{id}" @project = Project.find_with_namespace(project_path) - if @project and can?(current_user, :read_project, @project) if @project.path_with_namespace != project_path redirect_to request.original_url.gsub(project_path, @project.path_with_namespace) and return |