Skip to content

Commit c138007

Browse files
65436543
authored
Merge branch 'main' into NO-git.NewCommand
2 parents a2ac5af + 88939a5 commit c138007

File tree

8 files changed

+295
-45
lines changed

8 files changed

+295
-45
lines changed

‎.drone.yml

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,67 @@ steps:
854854
exclude:
855855
- pull_request
856856

857+
---
858+
kind: pipeline
859+
name: docker-linux-amd64-release-branch
860+
861+
platform:
862+
os: linux
863+
arch: amd64
864+
865+
depends_on:
866+
- testing-amd64
867+
- testing-arm64
868+
869+
trigger:
870+
ref:
871+
- "refs/heads/release/v*"
872+
event:
873+
exclude:
874+
- cron
875+
876+
steps:
877+
- name: fetch-tags
878+
image: docker:git
879+
commands:
880+
- git fetch --tags --force
881+
882+
- name: publish
883+
pull: always
884+
image: techknowlogick/drone-docker:latest
885+
settings:
886+
auto_tag: false
887+
tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64
888+
repo: gitea/gitea
889+
build_args:
890+
- GOPROXY=https://goproxy.cn
891+
password:
892+
from_secret: docker_password
893+
username:
894+
from_secret: docker_username
895+
when:
896+
event:
897+
exclude:
898+
- pull_request
899+
900+
- name: publish-rootless
901+
image: techknowlogick/drone-docker:latest
902+
settings:
903+
dockerfile: Dockerfile.rootless
904+
auto_tag: false
905+
tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64-rootless
906+
repo: gitea/gitea
907+
build_args:
908+
- GOPROXY=https://goproxy.cn
909+
password:
910+
from_secret: docker_password
911+
username:
912+
from_secret: docker_username
913+
when:
914+
event:
915+
exclude:
916+
- pull_request
917+
857918
---
858919
kind: pipeline
859920
type: docker
@@ -1010,6 +1071,68 @@ steps:
10101071
event:
10111072
exclude:
10121073
- pull_request
1074+
1075+
---
1076+
kind: pipeline
1077+
name: docker-linux-arm64-release-branch
1078+
1079+
platform:
1080+
os: linux
1081+
arch: arm64
1082+
1083+
depends_on:
1084+
- testing-amd64
1085+
- testing-arm64
1086+
1087+
trigger:
1088+
ref:
1089+
- "refs/heads/release/v*"
1090+
event:
1091+
exclude:
1092+
- cron
1093+
1094+
steps:
1095+
- name: fetch-tags
1096+
image: docker:git
1097+
commands:
1098+
- git fetch --tags --force
1099+
1100+
- name: publish
1101+
pull: always
1102+
image: techknowlogick/drone-docker:latest
1103+
settings:
1104+
auto_tag: false
1105+
tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64
1106+
repo: gitea/gitea
1107+
build_args:
1108+
- GOPROXY=https://goproxy.cn
1109+
password:
1110+
from_secret: docker_password
1111+
username:
1112+
from_secret: docker_username
1113+
when:
1114+
event:
1115+
exclude:
1116+
- pull_request
1117+
1118+
- name: publish-rootless
1119+
image: techknowlogick/drone-docker:latest
1120+
settings:
1121+
dockerfile: Dockerfile.rootless
1122+
auto_tag: false
1123+
tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64-rootless
1124+
repo: gitea/gitea
1125+
build_args:
1126+
- GOPROXY=https://goproxy.cn
1127+
password:
1128+
from_secret: docker_password
1129+
username:
1130+
from_secret: docker_username
1131+
when:
1132+
event:
1133+
exclude:
1134+
- pull_request
1135+
10131136
---
10141137
kind: pipeline
10151138
type: docker
@@ -1098,6 +1221,8 @@ trigger:
10981221
depends_on:
10991222
- docker-linux-amd64-release
11001223
- docker-linux-arm64-release
1224+
- docker-linux-amd64-release-branch
1225+
- docker-linux-arm64-release-branch
11011226

11021227
---
11031228
kind: pipeline
@@ -1131,6 +1256,8 @@ depends_on:
11311256
- docker-linux-arm64-release
11321257
- docker-linux-amd64-release-version
11331258
- docker-linux-arm64-release-version
1259+
- docker-linux-amd64-release-branch
1260+
- docker-linux-arm64-release-branch
11341261
- docker-manifest
11351262
- docker-manifest-version
11361263
- docs

‎docker/manifest.rootless.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-rootless
1+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}dev{{/if}}-rootless
22
{{#if build.tags}}
33
tags:
44
{{#each build.tags}}
@@ -8,12 +8,12 @@ tags:
88
{{/if}}
99
manifests:
1010
-
11-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-linux-amd64-rootless
11+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}dev{{/if}}-linux-amd64-rootless
1212
platform:
1313
architecture: amd64
1414
os: linux
1515
-
16-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-linux-arm64-rootless
16+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}dev{{/if}}-linux-arm64-rootless
1717
platform:
1818
architecture: arm64
1919
os: linux

‎docker/manifest.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}
1+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}dev{{/if}}
22
{{#if build.tags}}
33
tags:
44
{{#each build.tags}}
@@ -8,12 +8,12 @@ tags:
88
{{/if}}
99
manifests:
1010
-
11-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-linux-amd64
11+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}dev{{/if}}-linux-amd64
1212
platform:
1313
architecture: amd64
1414
os: linux
1515
-
16-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-linux-arm64
16+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}dev{{/if}}-linux-arm64
1717
platform:
1818
architecture: arm64
1919
os: linux

‎options/locale/locale_ja-JP.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ search=検索
268268
code=コード
269269
search.fuzzy=あいまい
270270
search.match=一致
271+
code_search_unavailable=現在コード検索は利用できません。 サイト管理者にお問い合わせください。
271272
repo_no_results=一致するリポジトリが見つかりません。
272273
user_no_results=一致するユーザーが見つかりません。
273274
org_no_results=一致する組織が見つかりません。
@@ -1262,6 +1263,7 @@ issues.filter_sort.moststars=スターが多い順
12621263
issues.filter_sort.feweststars=スターが少ない順
12631264
issues.filter_sort.mostforks=フォークが多い順
12641265
issues.filter_sort.fewestforks=フォークが少ない順
1266+
issues.keyword_search_unavailable=現在キーワード検索は利用できません。 サイト管理者にお問い合わせください。
12651267
issues.action_open=オープン
12661268
issues.action_close=クローズ
12671269
issues.action_label=ラベル
@@ -1707,6 +1709,8 @@ search.search_repo=リポジトリを検索
17071709
search.fuzzy=あいまい
17081710
search.match=一致
17091711
search.results=<a href="%[2]s">%[3]s</a> 内での "%[1]s" の検索結果
1712+
search.code_no_results=検索ワードに一致するソースコードが見つかりません。
1713+
search.code_search_unavailable=現在コード検索は利用できません。 サイト管理者にお問い合わせください。
17101714

17111715
settings=設定
17121716
settings.desc=設定では、リポジトリの設定を管理することができます。

‎services/mailer/mail.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"strconv"
1515
"strings"
1616
texttmpl "text/template"
17+
"time"
1718

1819
"code.gitea.io/gitea/models"
1920
repo_model "code.gitea.io/gitea/models/repo"
@@ -298,13 +299,15 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
298299
}
299300

300301
// Make sure to compose independent messages to avoid leaking user emails
302+
msgID := createReference(ctx.Issue, ctx.Comment, ctx.ActionType)
303+
reference := createReference(ctx.Issue, nil, models.ActionType(0))
304+
301305
msgs := make([]*Message, 0, len(recipients))
302306
for _, recipient := range recipients {
303307
msg := NewMessageFrom([]string{recipient.Email}, ctx.Doer.DisplayName(), setting.MailService.FromEmail, subject, mailBody.String())
304308
msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info)
305309

306-
msg.SetHeader("Message-ID", "<"+createReference(ctx.Issue, ctx.Comment)+">")
307-
reference := createReference(ctx.Issue, nil)
310+
msg.SetHeader("Message-ID", "<"+msgID+">")
308311
msg.SetHeader("In-Reply-To", "<"+reference+">")
309312
msg.SetHeader("References", "<"+reference+">")
310313

@@ -318,7 +321,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
318321
return msgs, nil
319322
}
320323

321-
func createReference(issue *models.Issue, comment *models.Comment) string {
324+
func createReference(issue *models.Issue, comment *models.Comment, actionType models.ActionType) string {
322325
var path string
323326
if issue.IsPull {
324327
path = "pulls"
@@ -329,6 +332,17 @@ func createReference(issue *models.Issue, comment *models.Comment) string {
329332
var extra string
330333
if comment != nil {
331334
extra = fmt.Sprintf("/comment/%d", comment.ID)
335+
} else {
336+
switch actionType {
337+
case models.ActionCloseIssue, models.ActionClosePullRequest:
338+
extra = fmt.Sprintf("/close/%d", time.Now().UnixNano()/1e6)
339+
case models.ActionReopenIssue, models.ActionReopenPullRequest:
340+
extra = fmt.Sprintf("/reopen/%d", time.Now().UnixNano()/1e6)
341+
case models.ActionMergePullRequest:
342+
extra = fmt.Sprintf("/merge/%d", time.Now().UnixNano()/1e6)
343+
case models.ActionPullRequestReadyForReview:
344+
extra = fmt.Sprintf("/ready/%d", time.Now().UnixNano()/1e6)
345+
}
332346
}
333347

334348
return fmt.Sprintf("%s/%s/%d%s@%s", issue.Repo.FullName(), path, issue.Index, extra, setting.Domain)

0 commit comments

Comments
 (0)