Skip to content

Commit d5add2e

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated translations via Crowdin Fix missed doer (go-gitea#30231) Add optional doctor storage init (go-gitea#30330) Avoid running action when action unit is disabled after workflows detected (go-gitea#30331) Avoid showing `Failed to change the default wiki branch` if repo has no wiki when saving repo settings (go-gitea#30329)
2 parents aa3428f + d7013c2 commit d5add2e

File tree

16 files changed

+124
-59
lines changed

16 files changed

+124
-59
lines changed

‎models/actions/task.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
auth_model "code.gitea.io/gitea/models/auth"
1313
"code.gitea.io/gitea/models/db"
14+
"code.gitea.io/gitea/models/unit"
1415
"code.gitea.io/gitea/modules/container"
1516
"code.gitea.io/gitea/modules/log"
1617
"code.gitea.io/gitea/modules/setting"
@@ -227,7 +228,9 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask
227228
if runner.RepoID != 0 {
228229
jobCond = builder.Eq{"repo_id": runner.RepoID}
229230
} else if runner.OwnerID != 0 {
230-
jobCond = builder.In("repo_id", builder.Select("id").From("repository").Where(builder.Eq{"owner_id": runner.OwnerID}))
231+
jobCond = builder.In("repo_id", builder.Select("id").From("repository").
232+
Join("INNER", "repo_unit", "`repository`.id = `repo_unit`.repo_id").
233+
Where(builder.Eq{"`repository`.owner_id": runner.OwnerID, "`repo_unit`.type": unit.TypeActions}))
231234
}
232235
if jobCond.IsValid() {
233236
jobCond = builder.In("run_id", builder.Select("id").From("action_run").Where(jobCond))

‎options/locale/locale_id-ID.ini

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,12 +1331,53 @@ runners.task_list.repository=Repositori
13311331
runners.task_list.commit=Memperbuat
13321332

13331333
runs.commit=Memperbuat
1334-
1335-
1336-
1334+
runs.no_matching_online_runner_helper=Tidak ada runner online yang cocok dengan label: %s
1335+
runs.actor=Aktor
1336+
runs.status=Status
1337+
runs.actors_no_select=Semua aktor
1338+
runs.status_no_select=Semua status
1339+
runs.no_results=Tidak ada hasil yang cocok.
1340+
runs.no_workflows=Belum ada alur kerja.
1341+
runs.no_workflows.quick_start=Tidak tahu cara memulai dengan Gitea Actions? Lihat <a target="_blank" rel="noopener noreferrer" href="%s">panduan cepat</a>.
1342+
runs.no_workflows.documentation=Untuk informasi lebih lanjut tentang Gitea Actions, lihat <a target="_blank" rel="noopener noreferrer" href="%s">dokumentasi</a>.
1343+
runs.no_runs=Alur kerja belum berjalan.
1344+
runs.empty_commit_message=(pesan commit kosong)
1345+
1346+
workflow.disable=Nonaktifkan Alur Kerja
1347+
workflow.disable_success=Alur kerja '%s' berhasil dinonaktifkan.
1348+
workflow.enable=Aktifkan Alur Kerja
1349+
workflow.enable_success=Alur kerja '%s' berhasil diaktifkan.
1350+
workflow.disabled=Alur kerja dinonaktifkan.
1351+
1352+
need_approval_desc=Butuh persetujuan untuk menjalankan alur kerja untuk pull request fork.
1353+
1354+
variables=Variabel
1355+
variables.management=Managemen Variabel
1356+
variables.creation=Tambah Variabel
1357+
variables.none=Belum ada variabel.
1358+
variables.deletion=Hapus variabel
1359+
variables.deletion.description=Menghapus variabel bersifat permanen dan tidak dapat dibatalkan. Lanjutkan?
1360+
variables.description=Variabel akan diteruskan ke beberapa tindakan dan tidak dapat dibaca sebaliknya.
1361+
variables.id_not_exist=Variabel dengan ID %d tidak ada.
1362+
variables.edit=Edit Variabel
1363+
variables.deletion.failed=Gagal menghapus variabel.
1364+
variables.deletion.success=Variabel telah dihapus.
1365+
variables.creation.failed=Gagal menambahkan variabel.
1366+
variables.creation.success=Variabel "%s" telah ditambahkan.
1367+
variables.update.failed=Gagal mengedit variabel.
1368+
variables.update.success=Variabel telah diedit.
13371369

13381370
[projects]
1371+
type-1.display_name=Proyek Individu
1372+
type-2.display_name=Proyek Repositori
1373+
type-3.display_name=Proyek Organisasi
13391374

13401375
[git.filemode]
1376+
changed_filemode=%[1]s → %[2]s
13411377
; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
1378+
directory=Directory
1379+
normal_file=Normal file
1380+
executable_file=Executable file
1381+
symbolic_link=Symbolic link
1382+
submodule=Submodule
13421383

‎routers/api/v1/repo/issue.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ func SearchIssues(ctx *context.APIContext) {
311311

312312
ctx.SetLinkHeader(int(total), limit)
313313
ctx.SetTotalCountHeader(total)
314-
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, issues))
314+
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, ctx.Doer, issues))
315315
}
316316

317317
// ListIssues list the issues of a repository
@@ -548,7 +548,7 @@ func ListIssues(ctx *context.APIContext) {
548548

549549
ctx.SetLinkHeader(int(total), listOptions.PageSize)
550550
ctx.SetTotalCountHeader(total)
551-
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, issues))
551+
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, ctx.Doer, issues))
552552
}
553553

554554
func getUserIDForFilter(ctx *context.APIContext, queryName string) int64 {
@@ -614,7 +614,7 @@ func GetIssue(ctx *context.APIContext) {
614614
ctx.NotFound()
615615
return
616616
}
617-
ctx.JSON(http.StatusOK, convert.ToAPIIssue(ctx, issue))
617+
ctx.JSON(http.StatusOK, convert.ToAPIIssue(ctx, ctx.Doer, issue))
618618
}
619619

620620
// CreateIssue create an issue of a repository
@@ -737,7 +737,7 @@ func CreateIssue(ctx *context.APIContext) {
737737
ctx.Error(http.StatusInternalServerError, "GetIssueByID", err)
738738
return
739739
}
740-
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, issue))
740+
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, ctx.Doer, issue))
741741
}
742742

743743
// EditIssue modify an issue of a repository
@@ -911,7 +911,7 @@ func EditIssue(ctx *context.APIContext) {
911911
ctx.InternalServerError(err)
912912
return
913913
}
914-
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, issue))
914+
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, ctx.Doer, issue))
915915
}
916916

917917
func DeleteIssue(ctx *context.APIContext) {

‎routers/api/v1/repo/issue_attachment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func ListIssueAttachments(ctx *context.APIContext) {
107107
return
108108
}
109109

110-
ctx.JSON(http.StatusOK, convert.ToAPIIssue(ctx, issue).Attachments)
110+
ctx.JSON(http.StatusOK, convert.ToAPIIssue(ctx, ctx.Doer, issue).Attachments)
111111
}
112112

113113
// CreateIssueAttachment creates an attachment and saves the given file

‎routers/api/v1/repo/issue_dependency.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func GetIssueDependencies(ctx *context.APIContext) {
153153
blockerIssues = append(blockerIssues, &blocker.Issue)
154154
}
155155

156-
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, blockerIssues))
156+
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, ctx.Doer, blockerIssues))
157157
}
158158

159159
// CreateIssueDependency create a new issue dependencies
@@ -214,7 +214,7 @@ func CreateIssueDependency(ctx *context.APIContext) {
214214
return
215215
}
216216

217-
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, target))
217+
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, ctx.Doer, target))
218218
}
219219

220220
// RemoveIssueDependency remove an issue dependency
@@ -275,7 +275,7 @@ func RemoveIssueDependency(ctx *context.APIContext) {
275275
return
276276
}
277277

278-
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, target))
278+
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, ctx.Doer, target))
279279
}
280280

281281
// GetIssueBlocks list issues that are blocked by this issue
@@ -381,7 +381,7 @@ func GetIssueBlocks(ctx *context.APIContext) {
381381
issues = append(issues, &depMeta.Issue)
382382
}
383383

384-
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, issues))
384+
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, ctx.Doer, issues))
385385
}
386386

387387
// CreateIssueBlocking block the issue given in the body by the issue in path
@@ -438,7 +438,7 @@ func CreateIssueBlocking(ctx *context.APIContext) {
438438
return
439439
}
440440

441-
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, dependency))
441+
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, ctx.Doer, dependency))
442442
}
443443

444444
// RemoveIssueBlocking unblock the issue given in the body by the issue in path
@@ -495,7 +495,7 @@ func RemoveIssueBlocking(ctx *context.APIContext) {
495495
return
496496
}
497497

498-
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, dependency))
498+
ctx.JSON(http.StatusCreated, convert.ToAPIIssue(ctx, ctx.Doer, dependency))
499499
}
500500

501501
func getParamsIssue(ctx *context.APIContext) *issues_model.Issue {

‎routers/api/v1/repo/issue_pin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func ListPinnedIssues(ctx *context.APIContext) {
207207
return
208208
}
209209

210-
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, issues))
210+
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, ctx.Doer, issues))
211211
}
212212

213213
// ListPinnedPullRequests returns a list of all pinned PRs

‎routers/api/v1/repo/issue_tracked_time.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func ListTrackedTimes(ctx *context.APIContext) {
138138
}
139139

140140
ctx.SetTotalCountHeader(count)
141-
ctx.JSON(http.StatusOK, convert.ToTrackedTimeList(ctx, trackedTimes))
141+
ctx.JSON(http.StatusOK, convert.ToTrackedTimeList(ctx, ctx.Doer, trackedTimes))
142142
}
143143

144144
// AddTime add time manual to the given issue
@@ -225,7 +225,7 @@ func AddTime(ctx *context.APIContext) {
225225
ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
226226
return
227227
}
228-
ctx.JSON(http.StatusOK, convert.ToTrackedTime(ctx, trackedTime))
228+
ctx.JSON(http.StatusOK, convert.ToTrackedTime(ctx, user, trackedTime))
229229
}
230230

231231
// ResetIssueTime reset time manual to the given issue
@@ -455,7 +455,7 @@ func ListTrackedTimesByUser(ctx *context.APIContext) {
455455
ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
456456
return
457457
}
458-
ctx.JSON(http.StatusOK, convert.ToTrackedTimeList(ctx, trackedTimes))
458+
ctx.JSON(http.StatusOK, convert.ToTrackedTimeList(ctx, ctx.Doer, trackedTimes))
459459
}
460460

461461
// ListTrackedTimesByRepository lists all tracked times of the repository
@@ -567,7 +567,7 @@ func ListTrackedTimesByRepository(ctx *context.APIContext) {
567567
}
568568

569569
ctx.SetTotalCountHeader(count)
570-
ctx.JSON(http.StatusOK, convert.ToTrackedTimeList(ctx, trackedTimes))
570+
ctx.JSON(http.StatusOK, convert.ToTrackedTimeList(ctx, ctx.Doer, trackedTimes))
571571
}
572572

573573
// ListMyTrackedTimes lists all tracked times of the current user
@@ -629,5 +629,5 @@ func ListMyTrackedTimes(ctx *context.APIContext) {
629629
}
630630

631631
ctx.SetTotalCountHeader(count)
632-
ctx.JSON(http.StatusOK, convert.ToTrackedTimeList(ctx, trackedTimes))
632+
ctx.JSON(http.StatusOK, convert.ToTrackedTimeList(ctx, ctx.Doer, trackedTimes))
633633
}

‎routers/web/repo/issue.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,7 +2179,7 @@ func GetIssueInfo(ctx *context.Context) {
21792179
}
21802180
}
21812181

2182-
ctx.JSON(http.StatusOK, convert.ToIssue(ctx, issue))
2182+
ctx.JSON(http.StatusOK, convert.ToIssue(ctx, ctx.Doer, issue))
21832183
}
21842184

21852185
// UpdateIssueTitle change issue's title
@@ -2709,7 +2709,7 @@ func SearchIssues(ctx *context.Context) {
27092709
}
27102710

27112711
ctx.SetTotalCountHeader(total)
2712-
ctx.JSON(http.StatusOK, convert.ToIssueList(ctx, issues))
2712+
ctx.JSON(http.StatusOK, convert.ToIssueList(ctx, ctx.Doer, issues))
27132713
}
27142714

27152715
func getUserIDForFilter(ctx *context.Context, queryName string) int64 {
@@ -2879,7 +2879,7 @@ func ListIssues(ctx *context.Context) {
28792879
}
28802880

28812881
ctx.SetTotalCountHeader(total)
2882-
ctx.JSON(http.StatusOK, convert.ToIssueList(ctx, issues))
2882+
ctx.JSON(http.StatusOK, convert.ToIssueList(ctx, ctx.Doer, issues))
28832883
}
28842884

28852885
func BatchDeleteIssues(ctx *context.Context) {

‎routers/web/repo/wiki_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,12 @@ func TestWikiRaw(t *testing.T) {
226226
func TestDefaultWikiBranch(t *testing.T) {
227227
unittest.PrepareTestEnv(t)
228228

229+
// repo with no wiki
230+
repoWithNoWiki := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
231+
assert.False(t, repoWithNoWiki.HasWiki())
232+
assert.NoError(t, wiki_service.ChangeDefaultWikiBranch(db.DefaultContext, repoWithNoWiki, "main"))
233+
234+
// repo with wiki
229235
assert.NoError(t, repo_model.UpdateRepositoryCols(db.DefaultContext, &repo_model.Repository{ID: 1, DefaultWikiBranch: "wrong-branch"}))
230236

231237
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki")

‎services/actions/notifier.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (n *actionsNotifier) NewIssue(ctx context.Context, issue *issues_model.Issu
4949
newNotifyInputFromIssue(issue, webhook_module.HookEventIssues).WithPayload(&api.IssuePayload{
5050
Action: api.HookIssueOpened,
5151
Index: issue.Index,
52-
Issue: convert.ToAPIIssue(ctx, issue),
52+
Issue: convert.ToAPIIssue(ctx, issue.Poster, issue),
5353
Repository: convert.ToRepo(ctx, issue.Repo, permission),
5454
Sender: convert.ToUser(ctx, issue.Poster, nil),
5555
}).Notify(withMethod(ctx, "NewIssue"))
@@ -89,7 +89,7 @@ func (n *actionsNotifier) IssueChangeContent(ctx context.Context, doer *user_mod
8989
WithPayload(&api.IssuePayload{
9090
Action: api.HookIssueEdited,
9191
Index: issue.Index,
92-
Issue: convert.ToAPIIssue(ctx, issue),
92+
Issue: convert.ToAPIIssue(ctx, doer, issue),
9393
Repository: convert.ToRepo(ctx, issue.Repo, permission),
9494
Sender: convert.ToUser(ctx, doer, nil),
9595
}).
@@ -127,7 +127,7 @@ func (n *actionsNotifier) IssueChangeStatus(ctx context.Context, doer *user_mode
127127
}
128128
apiIssue := &api.IssuePayload{
129129
Index: issue.Index,
130-
Issue: convert.ToAPIIssue(ctx, issue),
130+
Issue: convert.ToAPIIssue(ctx, doer, issue),
131131
Repository: convert.ToRepo(ctx, issue.Repo, permission),
132132
Sender: convert.ToUser(ctx, doer, nil),
133133
}
@@ -229,7 +229,7 @@ func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues
229229
WithPayload(&api.IssuePayload{
230230
Action: action,
231231
Index: issue.Index,
232-
Issue: convert.ToAPIIssue(ctx, issue),
232+
Issue: convert.ToAPIIssue(ctx, doer, issue),
233233
Repository: convert.ToRepo(ctx, issue.Repo, permission),
234234
Sender: convert.ToUser(ctx, doer, nil),
235235
}).
@@ -293,7 +293,7 @@ func notifyIssueCommentChange(ctx context.Context, doer *user_model.User, commen
293293

294294
payload := &api.IssueCommentPayload{
295295
Action: action,
296-
Issue: convert.ToAPIIssue(ctx, comment.Issue),
296+
Issue: convert.ToAPIIssue(ctx, doer, comment.Issue),
297297
Comment: convert.ToAPIComment(ctx, comment.Issue.Repo, comment),
298298
Repository: convert.ToRepo(ctx, comment.Issue.Repo, permission),
299299
Sender: convert.ToUser(ctx, doer, nil),

0 commit comments

Comments
 (0)