Redirect case sensitive project path to the normalized one

1 files changed, 6 insertions, 1 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9b6472a7b13..527c9da0faa 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -117,9 +117,14 @@ class ApplicationController < ActionController::Base
         redirect_to request.original_url.gsub(/\.git\Z/, '') and return
       end
 
-      @project = Project.find_with_namespace("#{namespace}/#{id}")
+      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
+        end
         @project
       elsif current_user.nil?
         @project = nil