From 75b62ffadcc16b9940988c517422cf8ccda20094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Mon, 1 Aug 2022 07:43:21 +0200 Subject: [PATCH 1/2] Fix screenshot upload for issue template (#1062) --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 7ccb70bc5b..a8d4e09660 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -48,7 +48,6 @@ body: and copy paste the text instead. Tip: You can attach images by clicking this area to highlight it and then dragging files in. - render: shell validations: required: false - type: checkboxes From 550aefead4884bd59e661e4a8094e4848d7ef597 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Tue, 2 Aug 2022 19:34:16 +0300 Subject: [PATCH 2/2] Make returned proc list to be returned always in correct order (#1060) --- server/store/datastore/proc.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/store/datastore/proc.go b/server/store/datastore/proc.go index 9408d511cc..1a3a11e409 100644 --- a/server/store/datastore/proc.go +++ b/server/store/datastore/proc.go @@ -44,7 +44,10 @@ func (s storage) ProcChild(build *model.Build, ppid int, child string) (*model.P func (s storage) ProcList(build *model.Build) ([]*model.Proc, error) { procList := make([]*model.Proc, 0, perPage) - return procList, s.engine.Where("proc_build_id = ?", build.ID).Find(&procList) + return procList, s.engine. + Where("proc_build_id = ?", build.ID). + OrderBy("proc_pid"). + Find(&procList) } func (s storage) ProcCreate(procs []*model.Proc) error {