summaryrefslogtreecommitdiff
path: root/app/controllers/projects/application_controller.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-03 21:06:02 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-03 21:06:02 +0000
commitb7685ad1135451953d86029932606d69652bdace (patch)
treeceb3a39c9992f256be3076c23d6fd983d669e9fa /app/controllers/projects/application_controller.rb
parent1bf03125fa76b7a1423c77c394f5b36140d0b945 (diff)
parent63dac85385c6f82db6c6465876d76f67173ebc3b (diff)
downloadgitlab-ce-b7685ad1135451953d86029932606d69652bdace.tar.gz
Merge branch 'git_to_html_redirection' into 'master'
Redirect http://someproject.git to http://someproject Closes #26275 See merge request !8951
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
-rw-r--r--app/controllers/projects/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index ba523b190bf..db33b60b229 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -18,7 +18,7 @@ class Projects::ApplicationController < ApplicationController
# to
# localhost/group/project
#
- if id =~ /\.git\Z/
+ if params[:format] == 'git'
redirect_to request.original_url.gsub(/\.git\/?\Z/, '')
return
end