Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

5 files changed, 14 insertions, 19 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index d9cd60f8086..0123bf0627c 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -155,7 +155,8 @@ namespace :admin do
     put :clear_repository_check_states
     match :general, :integrations, :repository, :ci_cd, :reporting, :metrics_and_profiling, :network, :preferences, via: [:get, :patch]
     get :lets_encrypt_terms_of_service
-
+    get :slack_app_manifest_download, format: :json
+    get :slack_app_manifest_share
     get :service_usage_data
 
     resource :appearances, only: [:show, :create, :update], path: 'appearance', module: 'application_settings' do
diff --git a/config/routes/directs/subscription_portal.rb b/config/routes/directs/subscription_portal.rb
index 188725d16c1..cc6a3d6b5c0 100644
--- a/config/routes/directs/subscription_portal.rb
+++ b/config/routes/directs/subscription_portal.rb
@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 direct :subscription_portal_staging do
-  ENV.fetch('STAGING_CUSTOMER_PORTAL_URL', 'https://customers.staging.gitlab.com')
+  ENV.fetch('STAGING_CUSTOMER_PORTAL_URL', Gitlab::SubscriptionPortal.default_staging_customer_portal_url)
 end
 
 direct :subscription_portal do
   default_subscriptions_url = if ::Gitlab.dev_or_test_env?
                                 subscription_portal_staging_url
                               else
-                                'https://customers.gitlab.com'
+                                Gitlab::SubscriptionPortal.default_production_customer_portal_url
                               end
 
   ENV.fetch('CUSTOMER_PORTAL_URL', default_subscriptions_url)
diff --git a/config/routes/explore.rb b/config/routes/explore.rb
index 6ddf4d23138..6777571bb68 100644
--- a/config/routes/explore.rb
+++ b/config/routes/explore.rb
@@ -6,7 +6,7 @@ namespace :explore do
       get :trending
       get :starred
       get :topics
-      get 'topics/:topic_name', action: :topic, as: :topic, constraints: { topic_name: /.+/ }
+      get 'topics/:topic_name', action: :topic, as: :topic, constraints: { format: /(html|atom)/, topic_name: /.+?/ }
     end
   end
 
diff --git a/config/routes/organizations.rb b/config/routes/organizations.rb
index c35059cf411..4a8c9c25363 100644
--- a/config/routes/organizations.rb
+++ b/config/routes/organizations.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-resources :organizations, only: [], param: :organization_path, controller: 'organizations/organizations' do
+resources :organizations, only: [:show], param: :organization_path, controller: 'organizations/organizations' do
   member do
-    get :directory
+    get :groups_and_projects
   end
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index bf73f461629..73e4ed2fb8b 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -29,10 +29,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       # Use this scope for all new project routes.
       scope '-' do
         get 'archive/*id', format: true, constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+?/ }, to: 'repositories#archive', as: 'archive'
-        get 'metrics(/:dashboard_path)', constraints: { dashboard_path: /.+\.yml/ },
-          to: 'metrics_dashboard#show', as: :metrics_dashboard, format: false
-        get 'metrics(/:dashboard_path)/panel/new', constraints: { dashboard_path: /.+\.yml/ },
-          to: 'metrics_dashboard#show', as: :new_metrics_dashboard, format: false
 
         namespace :metrics, module: :metrics do
           namespace :dashboards do
@@ -250,11 +246,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         resource :import, only: [:new, :create, :show]
         resource :avatar, only: [:show, :destroy]
 
-        scope :grafana, as: :grafana_api do
-          get 'proxy/:datasource_id/*proxy_path', to: 'grafana_api#proxy'
-          get :metrics_dashboard, to: 'grafana_api#metrics_dashboard'
-        end
-
         resource :mattermost, only: [:new, :create]
         resource :variables, only: [:show, :update]
         resources :triggers, only: [:index, :create, :edit, :update, :destroy]
@@ -330,9 +321,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             post :stop
             post :cancel_auto_stop
             get :terminal
-            get :metrics
-            get :additional_metrics
-            get :metrics_dashboard
 
             # This route is also defined in gitlab-workhorse. Make sure to update accordingly.
             get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', format: false
@@ -343,7 +331,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
 
           collection do
-            get :metrics, action: :metrics_redirect
             get :folder, path: 'folders/*id', constraints: { format: /(html|json)/ }
             get :search
           end
@@ -412,6 +399,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
+        resources :tracing, only: [:index], controller: :tracing
+
         namespace :design_management do
           namespace :designs, path: 'designs/:design_id(/:sha)', constraints: -> (params) { params[:sha].nil? || Gitlab::Git.commit_id?(params[:sha]) } do
             resource :raw_image, only: :show
@@ -493,6 +482,11 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         namespace :ml do
           resources :experiments, only: [:index, :show, :destroy], controller: 'experiments', param: :iid
           resources :candidates, only: [:show, :destroy], controller: 'candidates', param: :iid
+          resources :models, only: [:index], controller: 'models'
+        end
+
+        namespace :service_desk do
+          resource :custom_email, only: [:show, :create, :update, :destroy], controller: 'custom_email'
         end
       end
       # End of the /-/ scope.