Gitea Rebase 20/02/2023 #395

New Issue

Closed

opened 2023-02-20 12:42:37 +00:00 by dachary · 0 comments

dachary commented

2023-02-20 12:42:37 +00:00

Owner

PRs

Provide detailed instructions to explain how to cherry pick

#376

Gitea main & stable

push Gitea main, release/v1.18 in forgejo

test-env

update https://codeberg.org/forgejo/test-env/ to match https://gitea.com/gitea/test-env
set the 1.18 branch to match main

Rebase milestone

Created manually https://codeberg.org/forgejo/forgejo/milestone/3513
All PRs in the milestone were prepared with main.sh rebase_* & manual intervention
Each PR has comments to document the manual actions

development

reset to forgejo/main
merge forgejo-{privacy,i18n,branding,a11y} into forgejo
force push to forgejo
branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/613

v1.18

merge v1.18/forgejo-{privacy,i18n,branding,a11y} into v1.18/forgejo
revert excluded 1.18.4-0
- 1d191f9b5a Adding a reply to an outdated review appears to not post (but still does) because it is too complex and can lead to regressions
- e4238583db Improve trace logging for pulls and processes because it is a feature that is not strictly necessary
force push to v1.18/forgejo
- branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/652
- tag run v1.18.3-3 on forgejo-integration https://ci.dachary.org/forgejo-integration/forgejo/pipeline/124
- tag run v1.18.3-3 on forgejo/experimental https://ci.dachary.org/forgejo/experimental/pipeline/30
- run on https://codeberg.org/dachary/scripted-configuration/ with container v1.18 https://ci.dachary.org/dachary/scripted-configuration/pipeline/129

### Archive The current branches are archived using [main.sh archive_branches](https://codeberg.org/forgejo-contrib/soft-fork-tools). ### PRs Provide detailed instructions to explain how to cherry pick * https://codeberg.org/forgejo/forgejo/pulls/376 ### Gitea main & stable push Gitea main, release/v1.18 in forgejo ### test-env * update https://codeberg.org/forgejo/test-env/ to match https://gitea.com/gitea/test-env * set the 1.18 branch to match main ### Rebase milestone * Created manually https://codeberg.org/forgejo/forgejo/milestone/3513 * All PRs in the milestone were prepared with [main.sh rebase_*](https://codeberg.org/forgejo-contrib/soft-fork-tools) & manual intervention * Each PR has comments to document the manual actions #### development * reset to forgejo/main * merge `forgejo-{privacy,i18n,branding,a11y}` into `forgejo` * force push to `forgejo` * [x] branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/613 #### v1.18 * merge `v1.18/forgejo-{privacy,i18n,branding,a11y}` into `v1.18/forgejo` * revert excluded [1.18.4-0](https://codeberg.org/forgejo/forgejo/issues/386) - 1d191f9b5a262a9933c6024e051161dc90aa7f22 [Adding a reply to an outdated review appears to not post (but still does)](https://github.com/go-gitea/gitea/commit/1d191f9b5a262a9933c6024e051161dc90aa7f22) because it is too complex and can lead to regressions - e4238583db1647e05d0d664e5b2adae80b6270dc [Improve trace logging for pulls and processes](https://github.com/go-gitea/gitea/commit/e4238583db1647e05d0d664e5b2adae80b6270dc) because it is a feature that is not strictly necessary * force push to `v1.18/forgejo` * - [x] branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/652 * - [x] tag run v1.18.3-3 on forgejo-integration https://ci.dachary.org/forgejo-integration/forgejo/pipeline/124 * - [x] tag run v1.18.3-3 on forgejo/experimental https://ci.dachary.org/forgejo/experimental/pipeline/30 * - [x] run on https://codeberg.org/dachary/scripted-configuration/ with container v1.18 https://ci.dachary.org/dachary/scripted-configuration/pipeline/129

dachary added this to the Gitea Rebase 20/02/2023 milestone 2023-02-20 12:42:37 +00:00

dachary referenced this issue

2023-02-20 12:44:19 +00:00

[WORKFLOW] sync Forgejo with Gitea #51

dachary changed title from ~~Gitea Rebase ef11d4163~~ to Gitea Rebase 20/02/2023

2023-02-20 12:45:16 +00:00

dachary referenced this issue from a commit

2023-02-20 19:03:23 +00:00

Revert "Improve trace logging for pulls and processes (#22633) (#22812)"

dachary referenced this issue from a commit

2023-02-20 19:03:23 +00:00

Revert "some refactor about code comments(#20821) (#22707)"

dachary closed this issue

2023-02-20 22:07:36 +00:00

No Label