Skip to content

Commit 223e394

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Add link to members and repositories at teams page (go-gitea#27744) Add dedicated class for empty placeholders (go-gitea#27788) Close all hashed buffers (go-gitea#27787) Fix typo when updating email address (go-gitea#27789) Improve pull request command line instructions (go-gitea#27778)
2 parents 0d4b119 + 4f4ddcf commit 223e394

File tree

12 files changed

+76
-27
lines changed

12 files changed

+76
-27
lines changed

‎modules/packages/hashed_buffer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func NewHashedBuffer() (*HashedBuffer, error) {
3232
return NewHashedBufferWithSize(DefaultMemorySize)
3333
}
3434

35-
// NewHashedBuffer creates a hashed buffer with a specific memory size
35+
// NewHashedBufferWithSize creates a hashed buffer with a specific memory size
3636
func NewHashedBufferWithSize(maxMemorySize int) (*HashedBuffer, error) {
3737
b, err := filebuffer.New(maxMemorySize)
3838
if err != nil {

‎options/locale/locale_en-US.ini‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ write = Write
110110
preview = Preview
111111
loading = Loading…
112112

113-
step1 = Step 1:
114-
step2 = Step 2:
115-
116113
error = Error
117114
error404 = The page you are trying to reach either <strong>does not exist</strong> or <strong>you are not authorized</strong> to view it.
118115
go_back = Go Back
@@ -1797,9 +1794,11 @@ pulls.outdated_with_base_branch = This branch is out-of-date with the base branc
17971794
pulls.close = Close Pull Request
17981795
pulls.closed_at = `closed this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
17991796
pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
1800-
pulls.merge_instruction_hint = `You can also view <a class="show-instruction">command line instructions</a>.`
1801-
pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
1802-
pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
1797+
pulls.cmd_instruction_hint = `View <a class="show-instruction">command line instructions</a>.`
1798+
pulls.cmd_instruction_checkout_title = Checkout
1799+
pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes.
1800+
pulls.cmd_instruction_merge_title = Merge
1801+
pulls.cmd_instruction_merge_desc = Merge the changes and update on Gitea.
18031802
pulls.clear_merge_message = Clear merge message
18041803
pulls.clear_merge_message_hint = Clearing the merge message will only remove the commit message content and keep generated git trailers such as "Co-Authored-By …".
18051804

@@ -2857,7 +2856,7 @@ emails.updated = Email updated
28572856
emails.not_updated = Failed to update the requested email address: %v
28582857
emails.duplicate_active = This email address is already active for a different user.
28592858
emails.change_email_header = Update Email Properties
2860-
emails.change_email_text = Are your sure you want to update this email address?
2859+
emails.change_email_text = Are you sure you want to update this email address?
28612860

28622861
orgs.org_manage_panel = Organization Management
28632862
orgs.name = Name

‎services/packages/alpine/repository.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,8 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package
238238
}
239239

240240
unsignedIndexContent, _ := packages_module.NewHashedBuffer()
241+
defer unsignedIndexContent.Close()
242+
241243
h := sha1.New()
242244

243245
if err := writeGzipStream(io.MultiWriter(unsignedIndexContent, h), "APKINDEX", buf.Bytes(), true); err != nil {
@@ -275,6 +277,7 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package
275277
}
276278

277279
signedIndexContent, _ := packages_module.NewHashedBuffer()
280+
defer signedIndexContent.Close()
278281

279282
if err := writeGzipStream(
280283
signedIndexContent,

‎services/packages/debian/repository.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,16 @@ func buildPackagesIndices(ctx context.Context, ownerID int64, repoVersion *packa
196196
}
197197

198198
packagesContent, _ := packages_module.NewHashedBuffer()
199+
defer packagesContent.Close()
199200

200201
packagesGzipContent, _ := packages_module.NewHashedBuffer()
202+
defer packagesGzipContent.Close()
203+
201204
gzw := gzip.NewWriter(packagesGzipContent)
202205

203206
packagesXzContent, _ := packages_module.NewHashedBuffer()
207+
defer packagesXzContent.Close()
208+
204209
xzw, _ := xz.NewWriter(packagesXzContent)
205210

206211
w := io.MultiWriter(packagesContent, gzw, xzw)
@@ -323,6 +328,8 @@ func buildReleaseFiles(ctx context.Context, ownerID int64, repoVersion *packages
323328
}
324329

325330
inReleaseContent, _ := packages_module.NewHashedBuffer()
331+
defer inReleaseContent.Close()
332+
326333
sw, err := clearsign.Encode(inReleaseContent, e.PrivateKey, nil)
327334
if err != nil {
328335
return err
@@ -367,11 +374,14 @@ func buildReleaseFiles(ctx context.Context, ownerID int64, repoVersion *packages
367374
sw.Close()
368375

369376
releaseGpgContent, _ := packages_module.NewHashedBuffer()
377+
defer releaseGpgContent.Close()
378+
370379
if err := openpgp.ArmoredDetachSign(releaseGpgContent, e, bytes.NewReader(buf.Bytes()), nil); err != nil {
371380
return err
372381
}
373382

374383
releaseContent, _ := packages_module.CreateHashedBufferFromReader(&buf)
384+
defer releaseContent.Close()
375385

376386
for _, file := range []struct {
377387
Name string

‎services/packages/rpm/repository.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,14 @@ func buildRepomd(ctx context.Context, pv *packages_model.PackageVersion, ownerID
258258
}
259259

260260
repomdAscContent, _ := packages_module.NewHashedBuffer()
261+
defer repomdAscContent.Close()
262+
261263
if err := openpgp.ArmoredDetachSign(repomdAscContent, e, bytes.NewReader(buf.Bytes()), nil); err != nil {
262264
return err
263265
}
264266

265267
repomdContent, _ := packages_module.CreateHashedBufferFromReader(&buf)
268+
defer repomdContent.Close()
266269

267270
for _, file := range []struct {
268271
Name string
@@ -548,6 +551,8 @@ func (wc *writtenCounter) Written() int64 {
548551

549552
func addDataAsFileToRepo(ctx context.Context, pv *packages_model.PackageVersion, filetype string, obj any) (*repoData, error) {
550553
content, _ := packages_module.NewHashedBuffer()
554+
defer content.Close()
555+
551556
gzw := gzip.NewWriter(content)
552557
wc := &writtenCounter{}
553558
h := sha256.New()

‎templates/org/team/teams.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
{{end}}
3838
</div>
3939
<div class="ui bottom attached header">
40-
<p class="team-meta">{{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}} · {{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}}</p>
40+
<p class="team-meta"><a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}}</a> · <a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories">{{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}}</a></p>
4141
</div>
4242
</div>
4343
{{end}}

‎templates/package/shared/list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</div>
3939
{{else}}
4040
{{if not .HasPackages}}
41-
<div class="empty center">
41+
<div class="empty-placeholder">
4242
{{svg "octicon-package" 48}}
4343
<h2>{{ctx.Locale.Tr "packages.empty"}}</h2>
4444
{{if and .Repository .CanWritePackages}}

‎templates/repo/actions/runs_list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="flex-list">
22
{{if eq (len .Runs) 0}}
3-
<div class="empty center">
3+
<div class="empty-placeholder">
44
{{svg "octicon-no-entry" 48}}
55
<h2>{{if $.IsFiltered}}{{ctx.Locale.Tr "actions.runs.no_results"}}{{else}}{{ctx.Locale.Tr "actions.runs.no_runs"}}{{end}}</h2>
66
</div>

‎templates/repo/issue/view_content/pull.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@
372372
</div>
373373
{{end}}
374374

375-
{{if and .ShowMergeInstructions .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}}
376-
{{template "repo/issue/view_content/pull_merge_instruction" .Issue.PullRequest}}
375+
{{if and .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}}
376+
{{template "repo/issue/view_content/pull_merge_instruction" dict "PullRequest" .Issue.PullRequest "ShowMergeInstructions" .ShowMergeInstructions}}
377377
{{end}}
378378
</div>
379379
</div>

‎templates/repo/issue/view_content/pull_merge_instruction.tmpl‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
11
<div class="divider"></div>
2-
<div class="instruct-toggle"> {{ctx.Locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
2+
<div class="instruct-toggle"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint" | Safe}} </div>
33
<div class="instruct-content gt-mt-3 gt-hidden">
4-
<div><h3 class="gt-dib">{{ctx.Locale.Tr "step1"}}</h3> {{ctx.Locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>
4+
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
5+
{{$localBranch := .PullRequest.HeadBranch}}
6+
{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
7+
{{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}}
8+
{{end}}
59
<div class="ui secondary segment">
6-
{{if eq .Flow 0}}
7-
<div>git checkout -b {{if ne .HeadRepo.ID .BaseRepo.ID}}{{.HeadRepo.OwnerName}}-{{end}}{{.HeadBranch}} {{.BaseBranch}}</div>
8-
<div>git pull {{if ne .HeadRepo.ID .BaseRepo.ID}}<gitea-origin-url data-url="{{.HeadRepo.Link}}"></gitea-origin-url>{{else}}origin{{end}} {{.HeadBranch}}</div>
10+
{{if eq .PullRequest.Flow 0}}
11+
<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<gitea-origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></gitea-origin-url>{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
12+
<div>git checkout {{$localBranch}}</div>
913
{{else}}
10-
<div>git fetch origin {{.GetGitRefName}}:{{.HeadBranch}}</div>
14+
<div>git fetch -u origin {{.GetGitRefName}}:{{$localBranch}}</div>
1115
{{end}}
1216
</div>
13-
<div><h3 class="gt-dib">{{ctx.Locale.Tr "step2"}}</h3> {{ctx.Locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div>
17+
{{if .ShowMergeInstructions}}
18+
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}</div>
1419
<div class="ui secondary segment">
15-
<div>git checkout {{.BaseBranch}}</div>
16-
<div>git merge --no-ff {{if ne .HeadRepo.ID .BaseRepo.ID}}{{.HeadRepo.OwnerName}}-{{end}}{{.HeadBranch}}</div>
17-
<div>git push origin {{.BaseBranch}}</div>
20+
<div data-pull-merge-style="merge">
21+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
22+
<div>git merge --no-ff {{$localBranch}}</div>
23+
</div>
24+
<div class="gt-hidden" data-pull-merge-style="rebase">
25+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
26+
<div>git merge --ff-only {{$localBranch}}</div>
27+
</div>
28+
<div class="gt-hidden" data-pull-merge-style="rebase-merge">
29+
<div>git checkout {{$localBranch}}</div>
30+
<div>git rebase {{.PullRequest.BaseBranch}}</div>
31+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
32+
<div>git merge --no-ff {{$localBranch}}</div>
33+
</div>
34+
<div class="gt-hidden" data-pull-merge-style="squash">
35+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
36+
<div>git merge --squash {{$localBranch}}</div>
37+
</div>
38+
<div class="gt-hidden" data-pull-merge-style="manually-merged">
39+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
40+
<div>git merge {{$localBranch}}</div>
41+
</div>
42+
<div>git push origin {{.PullRequest.BaseBranch}}</div>
1843
</div>
44+
{{end}}
1945
</div>

0 commit comments

Comments
 (0)