Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/config/routes/project.rb b/config/routes/project.rb
index 0cc8e83de2c..ddd1693ef02 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -274,8 +274,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        # The wiki routing contains wildcard characters so
+        # The wiki and repository routing contains wildcard characters so
         # its preferable to keep it below all other project routes
+        draw :repository_scoped
         draw :wiki
       end
       # End of the /-/ scope.
@@ -481,6 +482,13 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       # its preferable to keep it below all other project routes
       draw :repository
 
+      # To ensure an old unscoped routing is used for the UI we need to
+      # add prefix 'as' to the scope routing and place it below original routing.
+      # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849
+      scope '-', as: 'scoped' do
+        draw :repository
+      end
+
       # All new routes should go under /-/ scope.
       # Look for scope '-' at the top of the file.
       # rubocop: enable Cop/PutProjectRoutesUnderScope