Skip to content

Commit 1e4fa0d

Browse files
delvhsilverwind
authored andcommitted
Document how the TOC election process works (go-gitea#29135)
This is supposed to prevent a power vacuum so that a problem similar to the 2024 election will not happen again Additionally, update current TOC members from 2023 to 2024.
1 parent d278cd6 commit 1e4fa0d

File tree

1 file changed

+27
-9
lines changed

1 file changed

+27
-9
lines changed

CONTRIBUTING.md

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
- [Release Cycle](#release-cycle)
4848
- [Maintainers](#maintainers)
4949
- [Technical Oversight Committee (TOC)](#technical-oversight-committee-toc)
50+
- [TOC election process](#toc-election-process)
5051
- [Current TOC members](#current-toc-members)
5152
- [Previous TOC/owners members](#previous-tocowners-members)
5253
- [Governance Compensation](#governance-compensation)
@@ -486,36 +487,53 @@ if possible provide GPG signed commits.
486487
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/
487488
https://help.github.com/articles/signing-commits-with-gpg/
488489

490+
Furthermore, any account with write access (like bots and TOC members) **must** use 2FA.
491+
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/
492+
489493
## Technical Oversight Committee (TOC)
490494

491-
At the start of 2023, the `Owners` team was dissolved. Instead, the governance charter proposed a technical oversight committee (TOC) which expands the ownership team of the Gitea project from three elected positions to six positions. Three positions would be elected as it has been over the past years, and the other three would consist of appointed members from the Gitea company.
495+
At the start of 2023, the `Owners` team was dissolved. Instead, the governance charter proposed a technical oversight committee (TOC) which expands the ownership team of the Gitea project from three elected positions to six positions. Three positions are elected as it has been over the past years, and the other three consist of appointed members from the Gitea company.
492496
https://blog.gitea.com/quarterly-23q1/
493497

494-
When the new community members have been elected, the old members will give up ownership to the newly elected members. For security reasons, TOC members or any account with write access (like a bot) must use 2FA.
495-
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/
498+
### TOC election process
499+
500+
Any maintainer is eligible to be part of the community TOC if they are not associated with the Gitea company.
501+
A maintainer can either nominate themselves, or can be nominated by other maintainers to be a candidate for the TOC election.
502+
If you are nominated by someone else, you must first accept your nomination before the vote starts to be a candidate.
503+
504+
The TOC is elected for one year, the TOC election happens yearly.
505+
After the announcement of the results of the TOC election, elected members have two weeks time to confirm or refuse the seat.
506+
If an elected member does not answer within this timeframe, they are automatically assumed to refuse the seat.
507+
Refusals result in the person with the next highest vote getting the same choice.
508+
As long as seats are empty in the TOC, members of the previous TOC can fill them until an elected member accepts the seat.
509+
510+
If an elected member that accepts the seat does not have 2FA configured yet, they will be temporarily counted as `answer pending` until they manage to configure 2FA, thus leaving their seat empty for this duration.
496511

497512
### Current TOC members
498513

499-
- 2023-01-01 ~ 2023-12-31 - https://blog.gitea.com/quarterly-23q1/
514+
- 2024-01-01 ~ 2024-12-31
500515
- Company
501516
- [Jason Song](https://gitea.com/wolfogre) <[email protected]>
502517
- [Lunny Xiao](https://gitea.com/lunny) <[email protected]>
503-
- [Matti Ranta](https://gitea.com/techknowlogick) <techknowlogick@gitea.io>
518+
- [Matti Ranta](https://gitea.com/techknowlogick) <techknowlogick@gitea.com>
504519
- Community
505520
- [6543](https://gitea.com/6543) <[email protected]>
506-
- [Andrew Thornton](https://gitea.com/zeripath) <[email protected]>
521+
- [delvh](https://gitea.com/delvh) <[email protected]>
507522
- [John Olheiser](https://gitea.com/jolheiser) <[email protected]>
508523

509524
### Previous TOC/owners members
510525

511526
Here's the history of the owners and the time they served:
512527

513-
- [Lunny Xiao](https://gitea.com/lunny) - 2016, 2017, [2018](https://github.com/go-gitea/gitea/issues/3255), [2019](https://github.com/go-gitea/gitea/issues/5572), [2020](https://github.com/go-gitea/gitea/issues/9230), [2021](https://github.com/go-gitea/gitea/issues/13801), [2022](https://github.com/go-gitea/gitea/issues/17872)
528+
- [Lunny Xiao](https://gitea.com/lunny) - 2016, 2017, [2018](https://github.com/go-gitea/gitea/issues/3255), [2019](https://github.com/go-gitea/gitea/issues/5572), [2020](https://github.com/go-gitea/gitea/issues/9230), [2021](https://github.com/go-gitea/gitea/issues/13801), [2022](https://github.com/go-gitea/gitea/issues/17872), 2023
514529
- [Kim Carlbäcker](https://github.com/bkcsoft) - 2016, 2017
515530
- [Thomas Boerger](https://gitea.com/tboerger) - 2016, 2017
516531
- [Lauris Bukšis-Haberkorns](https://gitea.com/lafriks) - [2018](https://github.com/go-gitea/gitea/issues/3255), [2019](https://github.com/go-gitea/gitea/issues/5572), [2020](https://github.com/go-gitea/gitea/issues/9230), [2021](https://github.com/go-gitea/gitea/issues/13801)
517-
- [Matti Ranta](https://gitea.com/techknowlogick) - [2019](https://github.com/go-gitea/gitea/issues/5572), [2020](https://github.com/go-gitea/gitea/issues/9230), [2021](https://github.com/go-gitea/gitea/issues/13801), [2022](https://github.com/go-gitea/gitea/issues/17872)
518-
- [Andrew Thornton](https://gitea.com/zeripath) - [2020](https://github.com/go-gitea/gitea/issues/9230), [2021](https://github.com/go-gitea/gitea/issues/13801), [2022](https://github.com/go-gitea/gitea/issues/17872)
532+
- [Matti Ranta](https://gitea.com/techknowlogick) - [2019](https://github.com/go-gitea/gitea/issues/5572), [2020](https://github.com/go-gitea/gitea/issues/9230), [2021](https://github.com/go-gitea/gitea/issues/13801), [2022](https://github.com/go-gitea/gitea/issues/17872), 2023
533+
- [Andrew Thornton](https://gitea.com/zeripath) - [2020](https://github.com/go-gitea/gitea/issues/9230), [2021](https://github.com/go-gitea/gitea/issues/13801), [2022](https://github.com/go-gitea/gitea/issues/17872), 2023
534+
- [6543](https://gitea.com/6543) - 2023
535+
- [John Olheiser](https://gitea.com/jolheiser) - 2023
536+
- [Jason Song](https://gitea.com/wolfogre) - 2023
519537

520538
## Governance Compensation
521539

0 commit comments

Comments
 (0)