Add latest changes from gitlab-org/gitlab@master

8 files changed, 61 insertions, 64 deletions

diff --git a/config/database.yml.decomposed-postgresql b/config/database.yml.decomposed-postgresql
index 23c7f052f5a..04add959ad4 100644
--- a/config/database.yml.decomposed-postgresql
+++ b/config/database.yml.decomposed-postgresql
@@ -16,6 +16,14 @@ production:
     username: git
     password: "secure password"
     host: localhost
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_production
+    username: git
+    password: "secure password"
+    host: localhost
+
 #
 # Development specific
 #
@@ -38,6 +46,13 @@ development:
     host: localhost
     variables:
       statement_timeout: 15s
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_development
+    username: postgres
+    password: "secure password"
+    host: localhost
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -63,3 +78,10 @@ test: &test
     prepared_statements: false
     variables:
       statement_timeout: 15s
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_test
+    username: postgres
+    password:
+    host: localhost
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index a4daab1fd0c..5329a8e9fd7 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -18,6 +18,13 @@ production:
     #     port: 8600
     #     record: secondary.postgresql.service.consul
     #     interval: 300
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_production
+    username: git
+    password: "secure password"
+    host: localhost
 
 #
 # Development specific
@@ -32,6 +39,13 @@ development:
     host: localhost
     variables:
       statement_timeout: 15s
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_development
+    username: postgres
+    password: "secure password"
+    host: localhost
 
 #
 # Staging specific
@@ -44,6 +58,13 @@ staging:
     username: git
     password: "secure password"
     host: localhost
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_staging
+    username: git
+    password: "secure password"
+    host: localhost
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -59,3 +80,10 @@ test: &test
     prepared_statements: false
     variables:
       statement_timeout: 15s
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_test
+    username: postgres
+    password:
+    host: localhost
diff --git a/config/database_geo.yml.postgresql b/config/database_geo.yml.postgresql
deleted file mode 100644
index 25b9c6d5eb1..00000000000
--- a/config/database_geo.yml.postgresql
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# PRODUCTION
-#
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_geo_production
-  username: git
-  password: "secure password"
-  host: localhost
-
-#
-# Development specific
-#
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_geo_development
-  username: postgres
-  password: "secure password"
-  host: localhost
-
-#
-# Staging specific
-#
-staging:
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_geo_staging
-  username: git
-  password: "secure password"
-  host: localhost
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test: &test
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_geo_test
-  username: postgres
-  password:
-  host: localhost
diff --git a/config/feature_flags/development/pipeline_editor_file_tree.yml b/config/feature_flags/development/ci_show_all_projects_with_usage_sorted_descending.yml
index db31133a530..871cb26b316 100644
--- a/config/feature_flags/development/pipeline_editor_file_tree.yml
+++ b/config/feature_flags/development/ci_show_all_projects_with_usage_sorted_descending.yml
@@ -1,8 +1,8 @@
 ---
-name: pipeline_editor_file_tree
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83910
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357219
+name: ci_show_all_projects_with_usage_sorted_descending
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83680
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362331
 milestone: '15.0'
 type: development
-group: group::pipeline authoring
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 05d480f267e..2a9ce327d9d 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -711,7 +711,7 @@ Gitlab.ee do
   Settings.cron_jobs['ldap_sync_worker']['job_class'] = 'LdapSyncWorker'
   Settings.cron_jobs['free_user_cap_data_remediation'] ||= Settingslogic.new({})
   Settings.cron_jobs['free_user_cap_data_remediation']['cron'] ||= '17 6,10,14,18 * * *'
-  Settings.cron_jobs['free_user_cap_data_remediation']['job_class'] = 'Namespaces::FreeUserCapWorker'
+  Settings.cron_jobs['free_user_cap_data_remediation']['job_class'] = 'Namespaces::FreeUserCap::RemediationWorker'
   Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker']['cron'] ||= '0 12 * * *'
   Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker']['job_class'] = 'UpdateMaxSeatsUsedForGitlabComSubscriptionsWorker'
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index 050ab1d9b3e..84ef0bc9f16 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -1,14 +1,6 @@
 # frozen_string_literal: true
 
 Gitlab.ee do
-  # We need to initialize the Geo database before
-  # setting the Geo DB connection pool size.
-  if File.exist?(Rails.root.join('config/database_geo.yml'))
-    Rails.application.configure do
-      config.geo_database = config_for(:database_geo)
-    end
-  end
-
   if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured?
     # The Geo::TrackingBase model does not yet use connects_to. So,
     # this will not properly support geo: from config/databse.yml
diff --git a/config/routes.rb b/config/routes.rb
index b2b4bece68a..20098c422ec 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -228,7 +228,12 @@ Rails.application.routes.draw do
 
     draw :snippets
     draw :profile
-    draw :members
+
+    post '/mailgun/webhooks' => 'mailgun/webhooks#process_webhook'
+
+    # Deprecated route for permanent failures
+    # https://gitlab.com/gitlab-org/gitlab/-/issues/362606
+    post '/members/mailgun/permanent_failures' => 'mailgun/webhooks#process_webhook'
 
     # Product analytics collector
     match '/collector/i', to: ProductAnalytics::CollectorApp.new, via: :all
diff --git a/config/routes/members.rb b/config/routes/members.rb
deleted file mode 100644
index e84f0987171..00000000000
--- a/config/routes/members.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-namespace :members do
-  namespace :mailgun do
-    resources :permanent_failures, only: [:create]
-  end
-end