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: (21 commits) improve unit test for caching (go-gitea#26185) Render plaintext task list items for markdown files (go-gitea#26186) Add tooltip to describe LFS table column and color `delete LFS file` button red (go-gitea#26181) Show branches and tags that contain a commit (go-gitea#25180) Release attachments duplicated check (go-gitea#26176) Calculate MAX_WORKERS default value by CPU number (go-gitea#26177) Fixing redirection issue for logged-in users (go-gitea#26105) Update govulncheck, fix typo (go-gitea#26168) Fix handling of plenty Nuget package versions (go-gitea#26075) Fix typos in Contributing.md (go-gitea#26170) Disable download action logs button when there's no logs (go-gitea#26114) Re-add static images to docs (go-gitea#26167) Update email-setup.en-us.md (go-gitea#26068) Improve display of Labels/Projects/Assignees sort options (go-gitea#25886) Fix wrong branch name in rename branch modal (go-gitea#26146) Doc update swagger doc for POST /orgs/{org}/teams (go-gitea#26155) Fix UI regression of asciinema player (go-gitea#26159) refactor improve NoBetterThan (go-gitea#26126) Update Chinese documents (go-gitea#26139) Fix bugs in LFS meta garbage collection (go-gitea#26122) ...
- Loading branch information
Showing
99 changed files
with
1,020 additions
and
454 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,12 +29,12 @@ AIR_PACKAGE ?= github.com/cosmtrek/[email protected] | |
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/[email protected] | ||
GOFUMPT_PACKAGE ?= mvdan.cc/[email protected] | ||
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected] | ||
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/[email protected] | ||
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected] | ||
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/[email protected] | ||
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] | ||
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v0.2.0 | ||
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.0.0 | ||
ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/[email protected] | ||
|
||
DOCKER_IMAGE ?= gitea/gitea | ||
|
@@ -864,7 +864,7 @@ release-check: | $(DIST_DIRS) | |
|
||
.PHONY: release-compress | ||
release-compress: | $(DIST_DIRS) | ||
cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && $(GO) run $(GXZ_PAGAGE) -k -9 $${file}; done; | ||
cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && $(GO) run $(GXZ_PACKAGE) -k -9 $${file}; done; | ||
|
||
.PHONY: release-sources | ||
release-sources: | $(DIST_DIRS) | ||
|
@@ -903,7 +903,7 @@ deps-tools: | |
$(GO) install $(EDITORCONFIG_CHECKER_PACKAGE) | ||
$(GO) install $(GOFUMPT_PACKAGE) | ||
$(GO) install $(GOLANGCI_LINT_PACKAGE) | ||
$(GO) install $(GXZ_PAGAGE) | ||
$(GO) install $(GXZ_PACKAGE) | ||
$(GO) install $(MISSPELL_PACKAGE) | ||
$(GO) install $(SWAGGER_PACKAGE) | ||
$(GO) install $(XGO_PACKAGE) | ||
|
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 |
---|---|---|
|
@@ -31,7 +31,7 @@ Note: For Internet-facing sites consult documentation of your MTA for instructio | |
[mailer] | ||
ENABLED = true | ||
FROM = [email protected] | ||
MAILER_TYPE = sendmail | ||
PROTOCOL = sendmail | ||
SENDMAIL_PATH = /usr/sbin/sendmail | ||
SENDMAIL_ARGS = "--" ; most "sendmail" programs take options, "--" will prevent an email address being interpreted as an option. | ||
``` | ||
|
@@ -44,10 +44,9 @@ Directly use SMTP server as relay. This option is useful if you don't want to se | |
[mailer] | ||
ENABLED = true | ||
FROM = [email protected] | ||
MAILER_TYPE = smtp | ||
PROTOCOL = smtps | ||
SMTP_ADDR = mail.mydomain.com | ||
SMTP_PORT = 587 | ||
IS_TLS_ENABLED = true | ||
USER = [email protected] | ||
PASSWD = `password` | ||
``` | ||
|
@@ -80,7 +79,7 @@ SMTP_PORT = 465 | |
FROM = [email protected] | ||
USER = example.user | ||
PASSWD = `***` | ||
MAILER_TYPE = smtp | ||
PROTOCOL = smtp | ||
IS_TLS_ENABLED = true | ||
``` | ||
|
||
|
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 |
---|---|---|
|
@@ -31,7 +31,7 @@ Gitea 具有邮件功能,用于发送事务性邮件(例如注册确认邮 | |
[mailer] | ||
ENABLED = true | ||
FROM = [email protected] | ||
MAILER_TYPE = sendmail | ||
PROTOCOL = sendmail | ||
SENDMAIL_PATH = /usr/sbin/sendmail | ||
SENDMAIL_ARGS = "--" ; 大多数 "sendmail" 程序都接受选项,使用 "--" 将防止电子邮件地址被解释为选项。 | ||
``` | ||
|
@@ -44,10 +44,9 @@ SENDMAIL_ARGS = "--" ; 大多数 "sendmail" 程序都接受选项,使用 "--" | |
[mailer] | ||
ENABLED = true | ||
FROM = [email protected] | ||
MAILER_TYPE = smtp | ||
PROTOCOL = smtps | ||
SMTP_ADDR = mail.mydomain.com | ||
SMTP_PORT = 587 | ||
IS_TLS_ENABLED = true | ||
USER = [email protected] | ||
PASSWD = `password` | ||
``` | ||
|
@@ -80,8 +79,7 @@ SMTP_PORT = 465 | |
FROM = [email protected] | ||
USER = example.user | ||
PASSWD = `***` | ||
MAILER_TYPE = smtp | ||
IS_TLS_ENABLED = true | ||
PROTOCOL = smtps | ||
``` | ||
|
||
请注意,您需要创建并使用一个 [应用密码](https://support.google.com/accounts/answer/185833?hl=en) 并在您的 Google 帐户上启用 2FA。您将无法直接使用您的 Google 帐户密码。 |
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.