Merge branch 'dz-refactor-routing' into 'master'

Refactor some routing code

Closes #38075

See merge request gitlab-org/gitlab!23773

config/routes.rb

@@ -120,9 +120,7 @@ Rails.application.routes.draw do
       draw :country
       draw :country_state
       draw :subscription
-    end
 
-    Gitlab.ee do
       constraints(-> (*) { Gitlab::Analytics.any_features_enabled? }) do
         draw :analytics
       end
@@ -168,11 +166,6 @@ Rails.application.routes.draw do
     end
   end
 
-  draw :api
-  draw :sidekiq
-  draw :help
-  draw :snippets
-
   # Invites
   resources :invites, only: [:show], constraints: { id: /[A-Za-z0-9_-]+/ } do
     member do
@@ -193,6 +186,25 @@ Rails.application.routes.draw do
   # Notification settings
   resources :notification_settings, only: [:create, :update]
 
+  resources :groups, only: [:index, :new, :create] do
+    post :preview_markdown
+  end
+
+  resources :projects, only: [:index, :new, :create]
+
+  get '/projects/:id' => 'projects#resolve'
+
+  Gitlab.ee do
+    scope '/-/push_from_secondary/:geo_node_id' do
+      draw :git_http
+    end
+  end
+
+  draw :git_http
+  draw :api
+  draw :sidekiq
+  draw :help
+  draw :snippets
   draw :google_api
   draw :import
   draw :uploads

config/routes/group.rb

 # frozen_string_literal: true
 
-# rubocop: disable Cop/PutGroupRoutesUnderScope
-resources :groups, only: [:index, :new, :create] do
-  post :preview_markdown
-end
-# rubocop: enable Cop/PutGroupRoutesUnderScope
-
 constraints(::Constraints::GroupUrlConstrainer.new) do
   scope(path: 'groups/*id',
         controller: :groups,

config/routes/project.rb

 # frozen_string_literal: true
 
-# rubocop: disable Cop/PutProjectRoutesUnderScope
-resources :projects, only: [:index, :new, :create]
-
-draw :git_http
-
-get '/projects/:id' => 'projects#resolve'
-# rubocop: enable Cop/PutProjectRoutesUnderScope
-
 constraints(::Constraints::ProjectUrlConstrainer.new) do
   # If the route has a wildcard segment, the segment has a regex constraint,
   # the segment is potentially followed by _another_ wildcard segment, and

ee/config/routes/project.rb

 # frozen_string_literal: true
 
-scope "/-/push_from_secondary/:geo_node_id" do
-  draw :git_http
-end
-
 constraints(::Constraints::ProjectUrlConstrainer.new) do
   scope(path: '*namespace_id',
         as: :namespace,