From 477883c59521f65f0ab5d511ab02935d1f3dce60 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 29 Aug 2022 21:09:25 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 doc/administration/geo/replication/troubleshooting.md | 2 +-
 lib/tasks/gitlab/tw/codeowners.rake                   | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md
index 8d4235917df..d44aa49805b 100644
--- a/doc/administration/geo/replication/troubleshooting.md
+++ b/doc/administration/geo/replication/troubleshooting.md
@@ -276,7 +276,7 @@ sudo gitlab-rake gitlab:geo:check
   ```
 
   Ensure you have added the secondary node in the Admin Area of the **primary** node.
-  Also ensure you entered the `external_url` or `gitlab_rails['geo_node_name']`
+  Also ensure you entered the `gitlab_rails['geo_node_name']`
   when adding the secondary node in the Admin Area of the **primary** node.
   In GitLab 12.3 and earlier, edit the secondary node in the Admin Area of the **primary**
   node and ensure that there is a trailing `/` in the `Name` field.
diff --git a/lib/tasks/gitlab/tw/codeowners.rake b/lib/tasks/gitlab/tw/codeowners.rake
index d695547b0b1..148801254bf 100644
--- a/lib/tasks/gitlab/tw/codeowners.rake
+++ b/lib/tasks/gitlab/tw/codeowners.rake
@@ -19,10 +19,9 @@ namespace :tw do
     end
 
     CODE_OWNER_RULES = [
-      CodeOwnerRule.new('Activation', '@kpaizee'),
-      CodeOwnerRule.new("Adoption", '@kpaizee'),
-      CodeOwnerRule.new('Activation', '@kpaizee'),
-      CodeOwnerRule.new('Adoption', '@kpaizee'),
+      CodeOwnerRule.new('Activation', '@phillipwells'),
+      CodeOwnerRule.new('Acquisition', '@phillipwells'),
+      CodeOwnerRule.new('Anti-Abuse', '@phillipwells'),
       CodeOwnerRule.new('Authentication and Authorization', '@eread'),
       CodeOwnerRule.new('Certify', '@msedlakjakubowski'),
       CodeOwnerRule.new('Code Review', '@aqualls'),
@@ -41,7 +40,6 @@ namespace :tw do
       CodeOwnerRule.new('Dynamic Analysis', '@rdickenson'),
       CodeOwnerRule.new('Ecosystem', '@kpaizee'),
       CodeOwnerRule.new('Editor', '@aqualls'),
-      CodeOwnerRule.new('Expansion', '@kpaizee'),
       CodeOwnerRule.new('Foundations', '@rdickenson'),
       CodeOwnerRule.new('Fuzz Testing', '@rdickenson'),
       CodeOwnerRule.new('Geo', '@axil'),