From 9b59e82f74f04e224176756f8ef2735c7f6f1dd3 Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Fri, 24 Oct 2025 02:32:40 +0200
Subject: [PATCH 1/2] chore: move ex-shipyard users to contributors team

this is standard security procedure to ensure team memberships
reflect current responsibilities. if anyone needs to retain access
to repos which were granted by old teams, they should reach out
---
 github/ipfs.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/github/ipfs.yml b/github/ipfs.yml
index 9f6cddc..3532e4d 100644
--- a/github/ipfs.yml
+++ b/github/ipfs.yml
@@ -5401,7 +5401,6 @@ repositories:
           strict: true
     collaborators:
       admin:
-        - SgtPooki
       push:
         - web3-bot
     default_branch: main
@@ -5779,7 +5778,6 @@ teams:
     description: Community managers, community engineers, and other people that need write privs.
     members:
       maintainer:
-        - 2color
         - mishmosh
         - TheDiscordian
     privacy: closed
@@ -5788,6 +5786,10 @@ teams:
       maintainer:
         - aschmahmann
       member:
+        - 2color
+        - MarcoPolo
+        - SgtPooki
+        - sukunrt
         - achingbrain
         - adlrocha
         - alanshaw
@@ -5911,7 +5913,6 @@ teams:
       maintainer:
         - lidel
       member:
-        - SgtPooki
         - whizzzkid
     privacy: closed
   helia-dev:
@@ -5920,8 +5921,6 @@ teams:
       maintainer:
         - achingbrain
       member:
-        - 2color
-        - SgtPooki
     privacy: closed
   ipdx:
     members:
@@ -5965,7 +5964,6 @@ teams:
         - lidel
         - Stebalien
       member:
-        - 2color
         - aarshkshah1992
         - achingbrain
         - adlrocha
@@ -6009,7 +6007,6 @@ teams:
         - daviddias
         - lidel
       member:
-        - 2color
         - AuHau
         - dirkmc
         - Gozala
@@ -6018,7 +6015,6 @@ teams:
         - momack2
         - olizilla
         - rvagg
-        - SgtPooki
         - vasco-santos
         - vmx
         - wemeetagain
@@ -6084,12 +6080,10 @@ teams:
         - lidel
         - olizilla
       member:
-        - 2color
         - alanshaw
         - andyschwab
         - cwaring
         - ericronne
-        - SgtPooki
         - whizzzkid
     privacy: closed
   WG Infrastructure:
@@ -6130,5 +6124,4 @@ teams:
       member:
         - achingbrain
         - jacobheun
-        - SgtPooki
     privacy: closed

From 361941def0bf3b007148921d00a2d827bb65241d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Oct 2025 00:36:38 +0000
Subject: [PATCH 2/2] fix@18765911171 [skip fix]

---
 github/ipfs.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/github/ipfs.yml b/github/ipfs.yml
index 3532e4d..b5d3db3 100644
--- a/github/ipfs.yml
+++ b/github/ipfs.yml
@@ -5400,7 +5400,6 @@ repositories:
             - check
           strict: true
     collaborators:
-      admin:
       push:
         - web3-bot
     default_branch: main
@@ -5787,9 +5786,6 @@ teams:
         - aschmahmann
       member:
         - 2color
-        - MarcoPolo
-        - SgtPooki
-        - sukunrt
         - achingbrain
         - adlrocha
         - alanshaw
@@ -5815,6 +5811,7 @@ teams:
         - keks
         - Luzifer
         - magik6k
+        - MarcoPolo
         - marten-seemann
         - MichaelMure
         - mishmosh
@@ -5825,7 +5822,9 @@ teams:
         - parkan
         - petar
         - richardschneider
+        - SgtPooki
         - Stebalien
+        - sukunrt
         - TheDiscordian
         - tv42
         - vasco-santos
@@ -5920,7 +5919,6 @@ teams:
     members:
       maintainer:
         - achingbrain
-      member:
     privacy: closed
   ipdx:
     members: