summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-27 17:46:58 +0100
committerDouwe Maan <douwe@gitlab.com>2015-10-27 17:46:58 +0100
commit5b8e0f17a8e77bf4cbdb4ed61d116d29d9f3c9c7 (patch)
tree606bd29af2da226a85c1aa1953c2c2a21d476d84 /app/controllers/application_controller.rb
parent35d433a3200b64f80a21b940f68d97a4392611f2 (diff)
parent940d68cc4c349b574166b010666a36cf25f485b7 (diff)
downloadgitlab-ce-ci-details.tar.gz
Merge branch 'master' into ci-detailsci-details
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb1
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