forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: (38 commits) Document how the TOC election process works (go-gitea#29135) Runner tokens are multi use (go-gitea#29153) Fix Gitpod logic of setting ROOT_URL (go-gitea#29162) Remove jQuery from the user search form in admin page (go-gitea#29151) Dont load Review if Comment is CommentTypeReviewRequest (go-gitea#28551) Show `View at this point in history` for every commit (go-gitea#29122) [skip ci] Updated translations via Crowdin Add merge style `fast-forward-only` (go-gitea#28954) Use Markdown alert syntax for notes in README (go-gitea#29150) Refactor issue template parsing and fix API endpoint (go-gitea#29069) [skip ci] Updated translations via Crowdin Update some translations and fix markdown formatting (go-gitea#29099) Show more settings for empty repositories (go-gitea#29130) Update JS and PY dependencies (go-gitea#29127) Add alert blocks in markdown (go-gitea#29121) Remove obsolete border-radius on comment content (go-gitea#29128) Make blockquote border size less aggressive (go-gitea#29124) Drop "@" from email sender to avoid spam filters (go-gitea#29109) [skip ci] Updated translations via Crowdin Disallow duplicate storage paths (go-gitea#26484) ...
- Loading branch information
Showing
107 changed files
with
1,458 additions
and
892 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,6 +47,7 @@ | |
- [Release Cycle](#release-cycle) | ||
- [Maintainers](#maintainers) | ||
- [Technical Oversight Committee (TOC)](#technical-oversight-committee-toc) | ||
- [TOC election process](#toc-election-process) | ||
- [Current TOC members](#current-toc-members) | ||
- [Previous TOC/owners members](#previous-tocowners-members) | ||
- [Governance Compensation](#governance-compensation) | ||
|
@@ -486,36 +487,53 @@ if possible provide GPG signed commits. | |
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/ | ||
https://help.github.com/articles/signing-commits-with-gpg/ | ||
|
||
Furthermore, any account with write access (like bots and TOC members) **must** use 2FA. | ||
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/ | ||
|
||
## Technical Oversight Committee (TOC) | ||
|
||
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. | ||
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. | ||
https://blog.gitea.com/quarterly-23q1/ | ||
|
||
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. | ||
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/ | ||
### TOC election process | ||
|
||
Any maintainer is eligible to be part of the community TOC if they are not associated with the Gitea company. | ||
A maintainer can either nominate themselves, or can be nominated by other maintainers to be a candidate for the TOC election. | ||
If you are nominated by someone else, you must first accept your nomination before the vote starts to be a candidate. | ||
|
||
The TOC is elected for one year, the TOC election happens yearly. | ||
After the announcement of the results of the TOC election, elected members have two weeks time to confirm or refuse the seat. | ||
If an elected member does not answer within this timeframe, they are automatically assumed to refuse the seat. | ||
Refusals result in the person with the next highest vote getting the same choice. | ||
As long as seats are empty in the TOC, members of the previous TOC can fill them until an elected member accepts the seat. | ||
|
||
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. | ||
|
||
### Current TOC members | ||
|
||
- 2023-01-01 ~ 2023-12-31 - https://blog.gitea.com/quarterly-23q1/ | ||
- 2024-01-01 ~ 2024-12-31 | ||
- Company | ||
- [Jason Song](https://gitea.com/wolfogre) <[email protected]> | ||
- [Lunny Xiao](https://gitea.com/lunny) <[email protected]> | ||
- [Matti Ranta](https://gitea.com/techknowlogick) <techknowlogick@gitea.io> | ||
- [Matti Ranta](https://gitea.com/techknowlogick) <techknowlogick@gitea.com> | ||
- Community | ||
- [6543](https://gitea.com/6543) <[email protected]> | ||
- [Andrew Thornton](https://gitea.com/zeripath) <[email protected]> | ||
- [delvh](https://gitea.com/delvh) <[email protected]> | ||
- [John Olheiser](https://gitea.com/jolheiser) <[email protected]> | ||
|
||
### Previous TOC/owners members | ||
|
||
Here's the history of the owners and the time they served: | ||
|
||
- [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) | ||
- [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 | ||
- [Kim Carlbäcker](https://github.com/bkcsoft) - 2016, 2017 | ||
- [Thomas Boerger](https://gitea.com/tboerger) - 2016, 2017 | ||
- [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) | ||
- [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) | ||
- [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) | ||
- [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 | ||
- [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 | ||
- [6543](https://gitea.com/6543) - 2023 | ||
- [John Olheiser](https://gitea.com/jolheiser) - 2023 | ||
- [Jason Song](https://gitea.com/wolfogre) - 2023 | ||
|
||
## Governance Compensation | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,7 @@ EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-che | |
GOFUMPT_PACKAGE ?= mvdan.cc/[email protected] | ||
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected] | ||
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected] | ||
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/misspell@v0.3.4 | ||
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.4.1 | ||
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected] | ||
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest | ||
GO_LICENSES_PACKAGE ?= github.com/google/[email protected] | ||
|
@@ -146,6 +146,8 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMAN | |
GO_DIRS := build cmd models modules routers services tests | ||
WEB_DIRS := web_src/js web_src/css | ||
|
||
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github | ||
|
||
GO_SOURCES := $(wildcard *.go) | ||
GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" ! -path modules/options/bindata.go ! -path modules/public/bindata.go ! -path modules/templates/bindata.go) | ||
GO_SOURCES += $(GENERATED_GO_DEST) | ||
|
@@ -219,6 +221,8 @@ help: | |
@echo " - lint-swagger lint swagger files" | ||
@echo " - lint-templates lint template files" | ||
@echo " - lint-yaml lint yaml files" | ||
@echo " - lint-spell lint spelling" | ||
@echo " - lint-spell-fix lint spelling and fix issues" | ||
@echo " - checks run various consistency checks" | ||
@echo " - checks-frontend check frontend files" | ||
@echo " - checks-backend check backend files" | ||
|
@@ -308,10 +312,6 @@ fmt-check: fmt | |
exit 1; \ | ||
fi | ||
|
||
.PHONY: misspell-check | ||
misspell-check: | ||
go run $(MISSPELL_PACKAGE) -error $(GO_DIRS) $(WEB_DIRS) | ||
|
||
.PHONY: $(TAGS_EVIDENCE) | ||
$(TAGS_EVIDENCE): | ||
@mkdir -p $(MAKE_EVIDENCE_DIR) | ||
|
@@ -351,13 +351,13 @@ checks: checks-frontend checks-backend | |
checks-frontend: lockfile-check svg-check | ||
|
||
.PHONY: checks-backend | ||
checks-backend: tidy-check swagger-check fmt-check misspell-check swagger-validate security-check | ||
checks-backend: tidy-check swagger-check fmt-check swagger-validate security-check | ||
|
||
.PHONY: lint | ||
lint: lint-frontend lint-backend | ||
lint: lint-frontend lint-backend lint-spell | ||
|
||
.PHONY: lint-fix | ||
lint-fix: lint-frontend-fix lint-backend-fix | ||
lint-fix: lint-frontend-fix lint-backend-fix lint-spell-fix | ||
|
||
.PHONY: lint-frontend | ||
lint-frontend: lint-js lint-css | ||
|
@@ -395,6 +395,14 @@ lint-swagger: node_modules | |
lint-md: node_modules | ||
npx markdownlint docs *.md | ||
|
||
.PHONY: lint-spell | ||
lint-spell: | ||
@go run $(MISSPELL_PACKAGE) -error $(SPELLCHECK_FILES) | ||
|
||
.PHONY: lint-spell-fix | ||
lint-spell-fix: | ||
@go run $(MISSPELL_PACKAGE) -w $(SPELLCHECK_FILES) | ||
|
||
.PHONY: lint-go | ||
lint-go: | ||
$(GO) run $(GOLANGCI_LINT_PACKAGE) run | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -97,17 +97,17 @@ More info: https://docs.gitea.com/installation/install-from-source | |
|
||
./gitea web | ||
|
||
NOTE: If you're interested in using our APIs, we have experimental | ||
support with [documentation](https://try.gitea.io/api/swagger). | ||
> [!NOTE] | ||
> If you're interested in using our APIs, we have experimental support with [documentation](https://try.gitea.io/api/swagger). | ||
## Contributing | ||
|
||
Expected workflow is: Fork -> Patch -> Push -> Pull Request | ||
|
||
NOTES: | ||
|
||
1. **YOU MUST READ THE [CONTRIBUTORS GUIDE](CONTRIBUTING.md) BEFORE STARTING TO WORK ON A PULL REQUEST.** | ||
2. If you have found a vulnerability in the project, please write privately to **[email protected]**. Thanks! | ||
> [!NOTE] | ||
> | ||
> 1. **YOU MUST READ THE [CONTRIBUTORS GUIDE](CONTRIBUTING.md) BEFORE STARTING TO WORK ON A PULL REQUEST.** | ||
> 2. If you have found a vulnerability in the project, please write privately to **[email protected]**. Thanks! | ||
## Translating | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.