Merge branch 'main' into fix-19897

Author: balanceofcowards

Makefile

@@ -243,7 +243,7 @@ clean:
 .PHONY: fmt
 fmt:
 	@MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
-	$(eval TEMPLATES := $(wildcard templates/**/*.tmpl))
+	$(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl'))
 	@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it 
 	@$(SED_INPLACE) -e 's/{{[ 	]\{1,\}/{{/g' -e '/^[ 	]\{1,\}}}/! s/[ 	]\{1,\}}}/}}/g' $(TEMPLATES)
 

docs/content/doc/installation/on-kubernetes.zh-cn.md

@@ -30,8 +30,8 @@ helm install gitea gitea/gitea
 您也可以通过 `helm show` 命令导出 `README.md` 和配置文件 `values.yaml` 进行学习和编辑，例如：
 
 ```bash
-helm show values gitea > values.yaml
-helm show readme gitea > README.md
+helm show values gitea/gitea > values.yaml
+helm show readme gitea/gitea > README.md
 
 # 使用自定义的配置文件 values.yaml
 helm install gitea -f values.yaml gitea/gitea

models/issues/issue_project.go

@@ -68,6 +68,7 @@ func LoadIssuesFromBoard(b *project_model.Board) (IssueList, error) {
 		issues, err := Issues(&IssuesOptions{
 			ProjectBoardID: b.ID,
 			ProjectID:      b.ProjectID,
+			SortType:       "project-column-sorting",
 		})
 		if err != nil {
 			return nil, err
@@ -79,6 +80,7 @@ func LoadIssuesFromBoard(b *project_model.Board) (IssueList, error) {
 		issues, err := Issues(&IssuesOptions{
 			ProjectBoardID: -1, // Issues without ProjectBoardID
 			ProjectID:      b.ProjectID,
+			SortType:       "project-column-sorting",
 		})
 		if err != nil {
 			return nil, err

options/locale/locale_zh-CN.ini

@@ -3129,6 +3129,8 @@ rubygems.dependencies.development=开发依赖
 rubygems.required.ruby=需要 Ruby 版本
 rubygems.required.rubygems=需要 RubyGem 版本
 rubygems.documentation=关于 RubyGems 注册中心的更多信息，请参阅 <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/rubygems/">文档</a>。
+vagrant.install=若要添加一个 Vagrant box，请运行以下命令：
+vagrant.documentation=关于 Vagrant 注册中心的更多信息，请参阅 <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/vagrant/">文档</a>。
 settings.link=将此软件包链接到仓库
 settings.link.description=如果您将一个软件包与一个代码库链接起来，软件包将显示在代码库的软件包列表中。
 settings.link.select=选择仓库

templates/admin/auth/edit.tmpl

@@ -23,7 +23,7 @@
 
 				<!-- LDAP and DLDAP -->
 				{{if or .Source.IsLDAP .Source.IsDLDAP}}
-					{{ $cfg:=.Source.Cfg }}
+					{{$cfg:=.Source.Cfg}}
 					<div class="inline required field {{if .Err_SecurityProtocol}}error{{end}}">
 						<label>{{.locale.Tr "admin.auths.security_protocol"}}</label>
 						<div class="ui selection security-protocol dropdown">
@@ -180,7 +180,7 @@
 
 				<!-- SMTP -->
 				{{if .Source.IsSMTP}}
-					{{ $cfg:=.Source.Cfg }}
+					{{$cfg:=.Source.Cfg}}
 					<div class="inline required field">
 						<label>{{.locale.Tr "admin.auths.smtp_auth"}}</label>
 						<div class="ui selection type dropdown">
@@ -242,7 +242,7 @@
 
 				<!-- PAM -->
 				{{if .Source.IsPAM}}
-					{{ $cfg:=.Source.Cfg }}
+					{{$cfg:=.Source.Cfg}}
 					<div class="required field">
 						<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
 						<input id="pam_service_name" name="pam_service_name" value="{{$cfg.ServiceName}}" required>
@@ -262,7 +262,7 @@
 
 				<!-- OAuth2 -->
 				{{if .Source.IsOAuth2}}
-					{{ $cfg:=.Source.Cfg }}
+					{{$cfg:=.Source.Cfg}}
 					<div class="inline required field">
 						<label>{{.locale.Tr "admin.auths.oauth2_provider"}}</label>
 						<div class="ui selection type dropdown">
@@ -337,7 +337,7 @@
 
 					<div class="field">
 						<label for="oauth2_scopes">{{.locale.Tr "admin.auths.oauth2_scopes"}}</label>
-						<input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{Join $cfg.Scopes "," }}{{end}}">
+						<input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{Join $cfg.Scopes ","}}{{end}}">
 					</div>
 					<div class="field">
 						<label for="oauth2_required_claim_name">{{.locale.Tr "admin.auths.oauth2_required_claim_name"}}</label>
@@ -365,7 +365,7 @@
 
 				<!-- SSPI -->
 				{{if .Source.IsSSPI}}
-					{{ $cfg:=.Source.Cfg }}
+					{{$cfg:=.Source.Cfg}}
 					<div class="field">
 						<div class="ui checkbox">
 							<label for="sspi_auto_create_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_create_users"}}</strong></label>

templates/admin/auth/new.tmpl

@@ -30,10 +30,10 @@
 				</div>
 
 				<!-- LDAP and DLDAP -->
-				{{ template "admin/auth/source/ldap" . }}
+				{{template "admin/auth/source/ldap" .}}
 
 				<!-- SMTP -->
-				{{ template "admin/auth/source/smtp" . }}
+				{{template "admin/auth/source/smtp" .}}
 
 				<!-- PAM -->
 				<div class="pam required field {{if not (eq .type 4)}}hide{{end}}">
@@ -51,10 +51,10 @@
 				</div>
 
 				<!-- OAuth2 -->
-				{{ template "admin/auth/source/oauth" . }}
+				{{template "admin/auth/source/oauth" .}}
 
 				<!-- SSPI -->
-				{{ template "admin/auth/source/sspi" . }}
+				{{template "admin/auth/source/sspi" .}}
 
 				<div class="ldap field">
 					<div class="ui checkbox">

templates/admin/user/edit.tmpl

@@ -12,7 +12,7 @@
 				{{.CsrfTokenHtml}}
 				<div class="field {{if .Err_UserName}}error{{end}}">
 					<label for="user_name">{{.locale.Tr "username"}}</label>
-					<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal }}disabled{{end}}>
+					<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}}>
 				</div>
 				<!-- Types and name -->
 				<div class="inline required field {{if .Err_LoginType}}error{{end}}">

templates/admin/user/new.tmpl

@@ -69,7 +69,7 @@
 
 				<div class="inline field local{{if ne .login_type "0-0"}} hide{{end}}">
 					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "auth.allow_password_change" }}</strong></label>
+						<label><strong>{{.locale.Tr "auth.allow_password_change"}}</strong></label>
 						<input name="must_change_password" type="checkbox" checked>
 					</div>
 				</div>

templates/mail/auth/activate.tmpl

@@ -6,7 +6,7 @@
 	<title>{{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}}</title>
 </head>
 
-{{ $activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}}
+{{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}}
 <body>
 	<p>{{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName | Str2html}}</p><br>
 	<p>{{.locale.Tr "mail.activate_account.text_2" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>

templates/mail/auth/activate_email.tmpl

@@ -6,7 +6,7 @@
 	<title>{{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}}</title>
 </head>
 
-{{ $activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}}
+{{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}}
 <body>
 	<p>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape) | Str2html}}</p><br>
 	<p>{{.locale.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>