Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 5 insertions, 9 deletions

diff --git a/config/routes/group.rb b/config/routes/group.rb
index e07ed0fab05..e5bbfdf7548 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -23,9 +23,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       get 'archived', action: :show, as: :group_archived # rubocop:disable Cop/PutGroupRoutesUnderScope
     end
 
-    # These routes are legit and the cop rule will be improved in
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/230703
-    get '/', action: :show, as: :group_canonical # rubocop:disable Cop/PutGroupRoutesUnderScope
+    get '/', action: :show, as: :group_canonical
   end
 
   scope(path: 'groups/*group_id/-',
@@ -112,11 +110,9 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
         as: :group,
         constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ },
         controller: :groups) do
-    # These routes are legit and the cop rule will be improved in
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/230703
-    get '/', action: :show # rubocop:disable Cop/PutGroupRoutesUnderScope
-    patch '/', action: :update # rubocop:disable Cop/PutGroupRoutesUnderScope
-    put '/', action: :update # rubocop:disable Cop/PutGroupRoutesUnderScope
-    delete '/', action: :destroy # rubocop:disable Cop/PutGroupRoutesUnderScope
+    get '/', action: :show
+    patch '/', action: :update
+    put '/', action: :update
+    delete '/', action: :destroy
   end
 end