Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 7 deletions

diff --git a/config/routes/project.rb b/config/routes/project.rb
index f85267b66b3..df505f96c9d 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -286,6 +286,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         # The wiki and repository routing contains wildcard characters so
         # its preferable to keep it below all other project routes
         draw :repository_scoped
+        draw :repository
         draw :wiki
       end
       # End of the /-/ scope.
@@ -476,14 +477,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         post :web_ide_clientside_preview
       end
 
-      # The repository routing contains wildcard characters so
-      # 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.
+      # Deprecated unscoped routing.
       # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849
-      scope '-', as: 'scoped' do
+      scope as: 'deprecated' do
         draw :repository
       end