From 58d1d6a5c7e0a45c9aa8a9d4d1be24dbdce5a08a Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Fri, 27 Oct 2017 11:29:51 +0200 Subject: Free up some group reserved words --- lib/gitlab/routing.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'lib/gitlab/routing.rb') diff --git a/lib/gitlab/routing.rb b/lib/gitlab/routing.rb index abfd413b7ea..defb47663cb 100644 --- a/lib/gitlab/routing.rb +++ b/lib/gitlab/routing.rb @@ -42,10 +42,18 @@ module Gitlab end def self.redirect_legacy_paths(router, *paths) + build_redirect_path = lambda do |request, _params, path| + # Only replace the last occurence of `path`. + path = request.fullpath.sub(%r{/#{path}/*(?!.*#{path})}, "/-/#{path}/") + path << request.query_string if request.query_string.present? + + path + end + paths.each do |path| router.match "/#{path}(/*rest)", via: [:get, :post, :patch, :delete], - to: router.redirect { |_params, request| request.fullpath.gsub(%r{/#{path}/*}, "/-/#{path}/") }, + to: router.redirect { |params, request| build_redirect_path.call(request, params, path) }, as: "legacy_#{path}_redirect" end end -- cgit v1.2.1