summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-20 14:53:41 +0100
committerDouwe Maan <douwe@gitlab.com>2016-01-20 14:53:41 +0100
commitc23ca0b0b5640d9cbf3fbfd446916a228b581b2f (patch)
tree1aa14035e6484f0f1c16e71746391d6e6a0277b1 /app/controllers/application_controller.rb
parent701513dcc7afb403372bc738642a9a52e9be5983 (diff)
parent481644ca7c9f763d4646ad557cc3bcf8f4f71816 (diff)
downloadgitlab-ce-c23ca0b0b5640d9cbf3fbfd446916a228b581b2f.tar.gz
Merge branch 'master' into issue_3945
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8484a502024..8b62c11f7cc 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -116,7 +116,7 @@ class ApplicationController < ActionController::Base
# localhost/group/project
#
if id =~ /\.git\Z/
- redirect_to request.original_url.gsub(/\.git\Z/, '') and return
+ redirect_to request.original_url.gsub(/\.git\/?\Z/, '') and return
end
project_path = "#{namespace}/#{id}"