Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 8 deletions

diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb
index 2581a179c79..583b0081319 100644
--- a/lib/banzai/filter/relative_link_filter.rb
+++ b/lib/banzai/filter/relative_link_filter.rb
@@ -152,18 +152,11 @@ module Banzai
 
       def rebuild_relative_uri(uri)
         file_path = nested_file_path_if_exists(uri)
-        resource_type = uri_type(file_path)
-
-        # Repository routes are under /-/ scope now.
-        # Since we craft a path without using route helpers we must
-        # ensure - is added here.
-        prefix = '-' if %w(tree blob raw commits).include?(resource_type.to_s)
 
         uri.path = [
           relative_url_root,
           project.full_path,
-          prefix,
-          resource_type,
+          uri_type(file_path),
           Addressable::URI.escape(ref).gsub('#', '%23'),
           Addressable::URI.escape(file_path)
         ].compact.join('/').squeeze('/').chomp('/')