From 762154cbd793823aed438d72fbd82f31658f47bb Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 4 May 2026 23:39:20 +0200 Subject: [PATCH 01/20] fix: Fix `nolyfill` for renovate (#37537) Run `nolyfill` as a renovate post-upgrade step alongside `make svg`, so npm dep bumps keep `pnpm.overrides` in sync. --- This PR was written with the help of Claude Opus 4.7 --------- Signed-off-by: silverwind Co-authored-by: Claude (Opus 4.7) --- Makefile | 5 +++++ renovate.json5 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ad7739c07b..2466435b17 100644 --- a/Makefile +++ b/Makefile @@ -606,6 +606,11 @@ update-js: node_modules ## update js dependencies pnpm exec updates -u -f package.json rm -rf node_modules pnpm-lock.yaml pnpm install + @touch node_modules + $(MAKE) --no-print-directory nolyfill + +.PHONY: nolyfill +nolyfill: node_modules ## apply nolyfill overrides to package.json and relock pnpm exec nolyfill install pnpm install @touch node_modules diff --git a/renovate.json5 b/renovate.json5 index 586733b317..3362f52c23 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -71,8 +71,8 @@ "groupName": "npm dependencies", "matchManagers": ["npm"], "postUpgradeTasks": { - "commands": ["make svg"], - "fileFilters": ["public/assets/img/svg/**"], + "commands": ["make svg nolyfill"], + "fileFilters": ["package.json", "pnpm-lock.yaml", "public/assets/img/svg/**"], "executionMode": "branch", }, }, From 62300eab3bacc575bd29c68171f27f927d41ac60 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 4 May 2026 16:06:00 -0700 Subject: [PATCH 02/20] chore(deps): update action dependencies (#37540) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | Pending | |---|---|---|---|---| | [bitnamilegacy/minio](https://redirect.github.com/bitnami/containers) ([source](https://redirect.github.com/bitnami/containers/tree/HEAD/bitnami/minio)) | service | minor | `2021.3.17` → `2021.12.29` | | | [bitnamilegacy/minio](https://redirect.github.com/bitnami/containers) ([source](https://redirect.github.com/bitnami/containers/tree/HEAD/bitnami/minio)) | service | minor | `2023.8.31` → `2023.12.23` | | | [bitnamilegacy/mysql](https://redirect.github.com/bitnami/containers) ([source](https://redirect.github.com/bitnami/containers/tree/HEAD/bitnami/mysql)) | service | minor | `8.0` → `8.4` | | | [renovatebot/github-action](https://redirect.github.com/renovatebot/github-action) | action | patch | `v46.1.10` → `v46.1.12` | `v46.1.13` | --- ### Release Notes
renovatebot/github-action (renovatebot/github-action) ### [`v46.1.12`](https://redirect.github.com/renovatebot/github-action/releases/tag/v46.1.12) [Compare Source](https://redirect.github.com/renovatebot/github-action/compare/v46.1.11...v46.1.12) ##### Bug Fixes - **deps:** update dependency [@​actions/core](https://redirect.github.com/actions/core) to v3.0.1 ([e8a6055](https://redirect.github.com/renovatebot/github-action/commit/e8a6055d6d0dc2ca2280adc33c7b58f3fb124d12)) ##### Documentation - update references to renovatebot/github-action to v46.1.11 ([317011a](https://redirect.github.com/renovatebot/github-action/commit/317011a6efe6b58d6056f58ca8b431233eb718ab)) ##### Miscellaneous Chores - **deps:** update dependency typescript-eslint to v8.59.0 ([8e3560a](https://redirect.github.com/renovatebot/github-action/commit/8e3560ab95742bc3c7aaec7c2dd1cc3d0d276ae5)) ##### Continuous Integration - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.142.0 ([0fee00d](https://redirect.github.com/renovatebot/github-action/commit/0fee00dc59830af7f44ea0636b251550e54f5003)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.142.1 ([c7cfc88](https://redirect.github.com/renovatebot/github-action/commit/c7cfc8825059e6fa4bd036b39a06e0477d58f403)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.144.0 ([39e7d09](https://redirect.github.com/renovatebot/github-action/commit/39e7d09c7b2ce19c8c834ffe556e9965c119c885)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.145.0 ([0bbd415](https://redirect.github.com/renovatebot/github-action/commit/0bbd415a9c49a001a228460b287027d8a3739e8a)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.146.0 ([889c739](https://redirect.github.com/renovatebot/github-action/commit/889c7399cadabbf2657b872978141f03c9376640)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.147.0 ([7addce6](https://redirect.github.com/renovatebot/github-action/commit/7addce6f1e02342b36c2cb1a66db30345a2f109d)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.150.0 ([804ce16](https://redirect.github.com/renovatebot/github-action/commit/804ce1618f0c132478fd9c086d6febd009a723d0)) ### [`v46.1.11`](https://redirect.github.com/renovatebot/github-action/releases/tag/v46.1.11) [Compare Source](https://redirect.github.com/renovatebot/github-action/compare/v46.1.10...v46.1.11) ##### Documentation - update references to renovatebot/github-action to v46.1.10 ([0b264d2](https://redirect.github.com/renovatebot/github-action/commit/0b264d27f89fd1eb163fba418b0dbfe86c041395)) ##### Miscellaneous Chores - **deps:** update actions/setup-node action to v6.4.0 ([951a814](https://redirect.github.com/renovatebot/github-action/commit/951a81487afda3e08b127fef395e29498fd9d06c)) - **deps:** update dependency prettier to v3.8.3 ([a763833](https://redirect.github.com/renovatebot/github-action/commit/a763833a7d8da309d202e5fc67bc794efc7dc115)) - **deps:** update dependency typescript-eslint to v8.58.2 ([119d68e](https://redirect.github.com/renovatebot/github-action/commit/119d68e8f6114a37630c0a3a61aac696d593aa52)) ##### Build System - **deps:** lock file maintenance ([f82feed](https://redirect.github.com/renovatebot/github-action/commit/f82feedb561edc809d01476b568febf8d256a51a)) ##### Continuous Integration - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.132.3 ([99cc805](https://redirect.github.com/renovatebot/github-action/commit/99cc805d7583672991fd1bfe2ce488eac225f8f0)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.133.0 ([a63d39b](https://redirect.github.com/renovatebot/github-action/commit/a63d39be1e95f4aaa26c72acbdf1c65673468261)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.135.0 ([955b000](https://redirect.github.com/renovatebot/github-action/commit/955b0000ba399f944be088f7a4409a4c8fc0b699)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.136.0 ([65167cd](https://redirect.github.com/renovatebot/github-action/commit/65167cdb3f2b345241ea67249f4b238934933bcc)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.136.1 ([7b21b86](https://redirect.github.com/renovatebot/github-action/commit/7b21b86cedd4f06966dca17027c7c67625e599cd)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.136.3 ([28a2dc0](https://redirect.github.com/renovatebot/github-action/commit/28a2dc07b816f5893a6496d35b4b02742445c3c4)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.137.0 ([b0cf2a4](https://redirect.github.com/renovatebot/github-action/commit/b0cf2a4c9132b74c57aae8fcbb45a6aacd414022)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.138.0 ([3700882](https://redirect.github.com/renovatebot/github-action/commit/3700882c45d6eda087650c0edc72ba408f5b7a2e)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.138.1 ([f516ce2](https://redirect.github.com/renovatebot/github-action/commit/f516ce2f9261f68e96edd1499111ddb5077033bb)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.138.3 ([3411548](https://redirect.github.com/renovatebot/github-action/commit/3411548d9c9b822a7473c563535824c03a19df6a)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.139.0 ([5201886](https://redirect.github.com/renovatebot/github-action/commit/5201886b45291615a4f0b21fd08181cfe8123ba6)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.139.1 ([5856263](https://redirect.github.com/renovatebot/github-action/commit/5856263af8004562a8d50daf5c18b7a1a71920f8)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.139.4 ([999691d](https://redirect.github.com/renovatebot/github-action/commit/999691d7f3780b09bcd4e90e081bbce6b452ab25)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.139.5 ([f703a54](https://redirect.github.com/renovatebot/github-action/commit/f703a541309bb776377323a91735fa747d6efc39)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.139.6 ([3ba85c2](https://redirect.github.com/renovatebot/github-action/commit/3ba85c2979436007460d9ccf3f87bd0a4ef5e1ea)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.139.7 ([96f2f09](https://redirect.github.com/renovatebot/github-action/commit/96f2f09b9d7c8e6946b489aab3ca6f713a3bfbdc)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.139.8 ([5af45e5](https://redirect.github.com/renovatebot/github-action/commit/5af45e5b84b145ee1e14929493f8f054d922b441)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.140.0 ([01e9139](https://redirect.github.com/renovatebot/github-action/commit/01e91393d3c71fe95aec074539d4a0d9dc57068b)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.141.0 ([814a2a4](https://redirect.github.com/renovatebot/github-action/commit/814a2a47c0d23dad8d1f7302ade33a5bd966a8c7)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.141.1 ([fb3abdf](https://redirect.github.com/renovatebot/github-action/commit/fb3abdf7fa349ce51fd43364aa917f213f4d476c)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.141.2 ([e3a9af5](https://redirect.github.com/renovatebot/github-action/commit/e3a9af55ac512810165fe6f630d88fa4b02f0dca)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.141.5 ([4f14b2f](https://redirect.github.com/renovatebot/github-action/commit/4f14b2f81dd01dfd999aed7088db38a5e8042f08)) - **deps:** update ghcr.io/renovatebot/renovate docker tag to v43.141.6 ([2357784](https://redirect.github.com/renovatebot/github-action/commit/23577849552717b7ae5cdbb05082e5cc99e25dce))
--- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - Only on Monday (`* * * * 1`) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://redirect.github.com/renovatebot/renovate). --- .github/workflows/cron-renovate.yml | 2 +- .github/workflows/pull-db-tests.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cron-renovate.yml b/.github/workflows/cron-renovate.yml index 39bcf26ac9..c4906552d5 100644 --- a/.github/workflows/cron-renovate.yml +++ b/.github/workflows/cron-renovate.yml @@ -21,7 +21,7 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - uses: renovatebot/github-action@83ec54fee49ab67d9cd201084c1ff325b4b462e4 # v46.1.10 + - uses: renovatebot/github-action@f66d8679fcfcfa051abde6e7a623007173bf5164 # v46.1.12 with: renovate-version: ${{ env.RENOVATE_VERSION }} configurationFile: renovate.json5 diff --git a/.github/workflows/pull-db-tests.yml b/.github/workflows/pull-db-tests.yml index c2293ac853..944a117e15 100644 --- a/.github/workflows/pull-db-tests.yml +++ b/.github/workflows/pull-db-tests.yml @@ -34,7 +34,7 @@ jobs: minio: # as github actions doesn't support "entrypoint", we need to use a non-official image # that has a custom entrypoint set to "minio server /data" - image: bitnamilegacy/minio:2023.8.31 + image: bitnamilegacy/minio:2023.12.23 env: MINIO_ROOT_USER: 123456 MINIO_ROOT_PASSWORD: 12345678 @@ -124,7 +124,7 @@ jobs: ports: - 6379:6379 minio: - image: bitnamilegacy/minio:2021.3.17 + image: bitnamilegacy/minio:2021.12.29 env: MINIO_ACCESS_KEY: 123456 MINIO_SECRET_KEY: 12345678 @@ -172,7 +172,7 @@ jobs: services: mysql: # the bitnami mysql image has more options than the official one, it's easier to customize - image: bitnamilegacy/mysql:8.0 + image: bitnamilegacy/mysql:8.4 env: ALLOW_EMPTY_PASSWORD: true MYSQL_DATABASE: testgitea From c471af42668085fcb4a83cd5f53c1d39a5cfbe6d Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Tue, 5 May 2026 01:01:53 +0000 Subject: [PATCH 03/20] [skip ci] Updated translations via Crowdin --- options/locale/locale_fr-FR.json | 1 - options/locale/locale_ga-IE.json | 1 - 2 files changed, 2 deletions(-) diff --git a/options/locale/locale_fr-FR.json b/options/locale/locale_fr-FR.json index 870e1be56f..aa295c98a2 100644 --- a/options/locale/locale_fr-FR.json +++ b/options/locale/locale_fr-FR.json @@ -1958,7 +1958,6 @@ "repo.signing.wont_sign.headsigned": "La fusion ne sera pas signée car la dernière révision n’est pas signée.", "repo.signing.wont_sign.commitssigned": "La fusion ne sera pas signée car ses révisions ne sont pas signées.", "repo.signing.wont_sign.approved": "La fusion ne sera pas signée car la demande d'ajout n'a pas été approuvée.", - "repo.signing.wont_sign.not_signed_in": "Vous n'êtes pas connecté.", "repo.ext_wiki": "Accès au wiki externe", "repo.ext_wiki.desc": "Lier un wiki externe.", "repo.wiki": "Wiki", diff --git a/options/locale/locale_ga-IE.json b/options/locale/locale_ga-IE.json index 3584e0b597..f41aae7244 100644 --- a/options/locale/locale_ga-IE.json +++ b/options/locale/locale_ga-IE.json @@ -1958,7 +1958,6 @@ "repo.signing.wont_sign.headsigned": "Ní shínífear an cumasc toisc nach bhfuil an tiomantas ceann sínithe.", "repo.signing.wont_sign.commitssigned": "Ní shínífear an cumasc toisc nach bhfuil na tiomáintí gaolmhara go léir sínithe.", "repo.signing.wont_sign.approved": "Ní shíníofar an cumaisc toisc nach bhfuil an PR ceadaithe.", - "repo.signing.wont_sign.not_signed_in": "Níl tú sínithe isteach.", "repo.ext_wiki": "Rochtain ar Vicí Seachtrach", "repo.ext_wiki.desc": "Nasc le vicí seachtrach.", "repo.wiki": "Vicí", From 5e8004a5155fdd58bbe61a4f82cc598bef7994c4 Mon Sep 17 00:00:00 2001 From: premsreelathasugeendran Date: Tue, 5 May 2026 11:25:44 -0400 Subject: [PATCH 04/20] docs: fix 4 typos in CHANGELOG.md (#37549) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Docs polish — pure typo fixes, nothing under `src/`. ## Files - `CHANGELOG.md` - line 1386: `appearence` → `appearance` - line 2117: `succesfully` → `successfully` - line 2301: `preceeded` → `preceded` - line 5593: `paramater` → `parameter` Fixes were applied from a curated correction list, with code blocks / inline code / URLs left alone. --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3b6b94269..f807f16b3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1383,7 +1383,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.com). * Fix mCaptcha bug (#33659) (#33661) * Git graph: don't show detached commits (#33645) (#33650) * Use MatchPhraseQuery for bleve code search (#33628) - * Adjust appearence of commit status webhook (#33778) #33789 + * Adjust appearance of commit status webhook (#33778) #33789 * Upgrade golang net from 0.35.0 -> 0.36.0 (#33795) #33796 ## [1.23.4](https://github.com/go-gitea/gitea/releases/tag/v1.23.4) - 2025-02-16 @@ -2114,7 +2114,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.com). * Optimize repo-list layout to enhance visual experience (#31272) (#31276) * fixed the dropdown menu for the top New button to expand to the left (#31273) (#31275) * Fix Activity Page Contributors dropdown (#31264) (#31269) - * fix: allow actions artifacts storage migration to complete succesfully (#31251) (#31257) + * fix: allow actions artifacts storage migration to complete successfully (#31251) (#31257) * Make blockquote attention recognize more syntaxes (#31240) (#31250) * Remove .segment from .project-column (#31204) (#31239) * Ignore FindRecentlyPushedNewBranches err (#31164) (#31171) @@ -2298,7 +2298,7 @@ Key highlights of this release encompass significant changes categorized under ` * Performance optimization for git push and check permissions for push options (#30104) (#30354) * BUGFIXES * Fix close file in the Upload func (#30262) (#30269) - * Fix inline math blocks can't be preceeded/followed by alphanumerical characters (#30175) (#30250) + * Fix inline math blocks can't be preceded/followed by alphanumerical characters (#30175) (#30250) * Fix missing 0 prefix of GPG key id (#30245) (#30247) * Include encoding in signature payload (#30174) (#30181) * Move from `max( id )` to `max( index )` for latest commit statuses (#30076) (#30155) @@ -5590,7 +5590,7 @@ Key highlights of this release encompass significant changes categorized under ` * Fix navbar on project view (#17749) * More pleasantly handle broken or missing git repositories (#17747) * Use `*PushUpdateOptions` as receiver (#17724) - * Remove unused `user` paramater (#17723) + * Remove unused `user` parameter (#17723) * Better builtin avatar generator (#17707) * Cleanup and use global style on popups (#17674) * Move user/org deletion to services (#17673) From 6ba907d89cf1288878be1f3f1f4ca4ab665aa400 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 5 May 2026 23:54:07 +0800 Subject: [PATCH 05/20] Fix various problems (#37547) 1. Fix ugly commit form "warning" message 2. Use JSONError for "Update PR Branch" response 3. Remove useless "timeline" class 4. Make timeline review default to "comment" to avoid icon missing 5. Align PR's "command line instructions" UI 6. Simply "Update PR branch" button logic And then some TODOs are fixed. --------- Signed-off-by: wxiaoguang --- options/locale/locale_en-US.json | 2 +- routers/web/repo/pull.go | 20 +++----- templates/repo/editor/commit_form.tmpl | 6 +-- templates/repo/issue/view_content.tmpl | 6 +-- .../repo/issue/view_content/comments.tmpl | 12 +++-- .../issue/view_content/pull_merge_box.tmpl | 2 +- .../view_content/pull_merge_instruction.tmpl | 13 +++-- .../view_content/update_branch_by_merge.tmpl | 37 ++++++-------- tests/e2e/reactions.test.ts | 2 +- tests/integration/actions_trigger_test.go | 2 +- tests/integration/issue_test.go | 4 +- web_src/css/modules/checkbox.css | 1 + web_src/css/repo.css | 32 +++--------- web_src/js/features/repo-issue-content.ts | 4 +- web_src/js/features/repo-issue-pull.ts | 49 +++---------------- web_src/js/features/repo-legacy.ts | 7 +-- 16 files changed, 73 insertions(+), 126 deletions(-) diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index 6f3141885b..47fcac7ae7 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -1306,7 +1306,7 @@ "repo.editor.upload_file_is_locked": "File \"%s\" is locked by %s.", "repo.editor.upload_files_to_dir": "Upload files to \"%s\"", "repo.editor.cannot_commit_to_protected_branch": "Cannot commit to protected branch \"%s\".", - "repo.editor.no_commit_to_branch": "Unable to commit directly to branch because:", + "repo.editor.no_commit_to_branch": "Not allowed to commit directly to branch because:", "repo.editor.user_no_push_to_branch": "User cannot push to branch", "repo.editor.require_signed_commit": "Branch requires a signed commit", "repo.editor.cherry_pick": "Cherry-pick %s onto:", diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index eab4df77ad..d20bbdc36c 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -974,17 +974,15 @@ func UpdatePullRequest(ctx *context.Context) { return } - // ToDo: add check if maintainers are allowed to change branch ... (need migration & co) if (!allowedUpdateByMerge && !rebase) || (rebase && !allowedUpdateByRebase) { - ctx.Flash.Error(ctx.Tr("repo.pulls.update_not_allowed")) - ctx.Redirect(issue.Link()) + ctx.JSONError(ctx.Tr("repo.pulls.update_not_allowed")) return } // default merge commit message message := fmt.Sprintf("Merge branch '%s' into %s", issue.PullRequest.BaseBranch, issue.PullRequest.HeadBranch) - // The update process should not be cancelled by the user + // The update process should not be canceled by the user // so we set the context to be a background context if err = pull_service.Update(graceful.GetManager().ShutdownContext(), issue.PullRequest, ctx.Doer, message, rebase); err != nil { if pull_service.IsErrMergeConflicts(err) { @@ -998,8 +996,7 @@ func UpdatePullRequest(ctx *context.Context) { ctx.ServerError("UpdatePullRequest.HTMLString", err) return } - ctx.Flash.Error(flashError) - ctx.Redirect(issue.Link()) + ctx.JSONError(flashError) return } else if pull_service.IsErrRebaseConflicts(err) { conflictError := err.(pull_service.ErrRebaseConflicts) @@ -1012,19 +1009,18 @@ func UpdatePullRequest(ctx *context.Context) { ctx.ServerError("UpdatePullRequest.HTMLString", err) return } - ctx.Flash.Error(flashError) - ctx.Redirect(issue.Link()) + ctx.JSONError(flashError) return } - ctx.Flash.Error(err.Error()) - ctx.Redirect(issue.Link()) + log.Error("Update pull request failed: %v", err) + ctx.JSONError("Unable to update pull request") return } - time.Sleep(1 * time.Second) + time.Sleep(100 * time.Millisecond) // TODO: it is really questionable whether the Sleep is useful here, need to figure out ctx.Flash.Success(ctx.Tr("repo.pulls.update_branch_success")) - ctx.Redirect(issue.Link()) + ctx.JSONRedirect(issue.Link()) } // MergePullRequest response for merging pull request diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 7fdd36b3bd..d0c47e9bdd 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -22,7 +22,7 @@ -
+
@@ -30,9 +30,9 @@ {{svg "octicon-git-commit"}} {{ctx.Locale.Tr "repo.editor.commit_directly_to_this_branch" .BranchName}} {{if not .CommitFormOptions.CanCommitToBranch}} -
+
{{ctx.Locale.Tr "repo.editor.no_commit_to_branch"}} -
    +
      {{if not .CommitFormOptions.UserCanPush}}
    • {{ctx.Locale.Tr "repo.editor.user_no_push_to_branch"}}
      • {{end}} {{if and .CommitFormOptions.RequireSigned (not .CommitFormOptions.WillSign)}}
    • {{ctx.Locale.Tr "repo.editor.require_signed_commit"}}
      • {{end}}
    diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 275dd47a76..d1b327434b 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -1,8 +1,8 @@
    {{$createdStr:= DateUtils.TimeSince .Issue.CreatedUnix}} -
    -
    -
    +
    +
    +
    {{if .Issue.OriginalAuthor}} {{ctx.AvatarUtils.Avatar nil 40}} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 6a67ef754d..ad26d4da88 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -362,7 +362,7 @@ {{else if eq .Type 22}}
    - {{$reviewType := -1}} + {{$reviewType := 2}}{{/* default to "comment" type if the review record is missing */}} {{if .Review}}{{$reviewType = .Review.Type}}{{end}} {{if not .OriginalAuthor}} {{/* Some timeline avatars need a offset to correctly align with their speech bubble. @@ -372,15 +372,17 @@ {{ctx.AvatarUtils.Avatar .Poster 40}} {{end}} - - {{if .Review}}{{svg (printf "octicon-%s" .Review.Type.Icon)}}{{end}} + + {{- if .Review -}} + {{- svg (printf "octicon-%s" .Review.Type.Icon) -}} + {{- else -}} + {{- svg "octicon-comment" -}} + {{- end -}} {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} {{if eq $reviewType 1}} {{ctx.Locale.Tr "repo.issues.review.approve" $createdStr}} - {{else if eq $reviewType 2}} - {{ctx.Locale.Tr "repo.issues.review.comment" $createdStr}} {{else if eq $reviewType 3}} {{ctx.Locale.Tr "repo.issues.review.reject" $createdStr}} {{else}} diff --git a/templates/repo/issue/view_content/pull_merge_box.tmpl b/templates/repo/issue/view_content/pull_merge_box.tmpl index 9f6330305a..d1594a52dd 100644 --- a/templates/repo/issue/view_content/pull_merge_box.tmpl +++ b/templates/repo/issue/view_content/pull_merge_box.tmpl @@ -46,7 +46,7 @@ {{end}} {{if $data.ShowUpdatePullInfo}}
    - {{template "repo/issue/view_content/update_branch_by_merge" (dict "MergeBoxData" $data "Issue" $.Issue)}} + {{template "repo/issue/view_content/update_branch_by_merge" (dict "MergeBoxData" $data "IssueLink" $.Issue.Link)}}
    {{end}} diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl index 0f24b1b3ea..b3a36f01d6 100644 --- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl +++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl @@ -1,9 +1,14 @@ {{$data := $.MergeBoxData}} {{$pull := $.PullRequest}}
    - {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} -
    -

    {{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}

    {{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}
    + {{/* align with other item icon & text */}} + {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} + +
    +
    +

    {{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}

    + {{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}} +
    {{$localBranch := $pull.HeadBranch}} {{if ne $pull.HeadRepo.ID $pull.BaseRepo.ID}} {{$localBranch = print $pull.HeadRepo.OwnerName "-" $pull.HeadBranch}} @@ -19,7 +24,7 @@
    {{if $data.ShowMergeInstructions}}
    -

    {{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}

    +

    {{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}

    {{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}} {{if not $data.AutodetectManualMerge}}
    {{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}
    diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 0af10045d8..fcdf65b74d 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -1,33 +1,24 @@ {{$data := $.MergeBoxData}} -{{$issue := $.Issue}} +{{$issueLink := $.IssueLink}}
    {{svg "octicon-alert"}} {{ctx.Locale.Tr "repo.pulls.outdated_with_base_branch"}}
    -
    - {{if and $data.UpdateAllowed $data.UpdateByRebaseAllowed}} -
    - -
    - {{svg "octicon-triangle-down"}} -
    - {{ctx.Locale.Tr "repo.pulls.update_branch"}} - {{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}} -
    -
    + {{if $data.UpdateAllowed}} +
    + + {{if $data.UpdateByRebaseAllowed}} +
    + {{svg "octicon-triangle-down"}} +
    + {{ctx.Locale.Tr "repo.pulls.update_branch"}} + {{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}}
    - {{end}} - {{if and $data.UpdateAllowed (not $data.UpdateByRebaseAllowed)}} -
    - -
    +
    {{end}}
    + {{end}}
    diff --git a/tests/e2e/reactions.test.ts b/tests/e2e/reactions.test.ts index 603cae8298..2048b938cf 100644 --- a/tests/e2e/reactions.test.ts +++ b/tests/e2e/reactions.test.ts @@ -12,7 +12,7 @@ test('toggle issue reactions', async ({page, request}) => { ]); await page.goto(`/${owner}/${repoName}/issues/1`); - const issueComment = page.locator('.timeline-item.comment.first'); + const issueComment = page.locator('.timeline-item.comment.issue-content-comment'); const reactionPicker = issueComment.locator('.select-reaction'); await reactionPicker.click(); diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index 4d88d42f36..e7a3cd7b4f 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -1801,7 +1801,7 @@ jobs: testEditFile(t, session, "user2", repoName, repo.DefaultBranch, "dir1/dir1.txt", "11") // update by rebase req := NewRequest(t, "POST", fmt.Sprintf("/%s/%s/pulls/%d/update?style=rebase", "user2", repoName, apiPull.Index)) - session.MakeRequest(t, req, http.StatusSeeOther) + session.MakeRequest(t, req, http.StatusOK) runner.fetchNoTask(t) }) } diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 09475bad20..ba15f8962e 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -692,9 +692,9 @@ func TestIssueReferenceURL(t *testing.T) { htmlDoc := NewHTMLParser(t, resp.Body) // the "reference" uses relative URLs, then JS code will convert them to absolute URLs for current origin, in case users are using multiple domains - ref, _ := htmlDoc.Find(`.timeline-item.comment.first .reference-issue`).Attr("data-reference") + ref, _ := htmlDoc.Find(`.timeline-item.comment.issue-content-comment .reference-issue`).Attr("data-reference") assert.Equal(t, "/user2/repo1/issues/1#issue-1", ref) - ref, _ = htmlDoc.Find(`.timeline-item.comment:not(.first) .reference-issue`).Attr("data-reference") + ref, _ = htmlDoc.Find(`.timeline-item.comment:not(.issue-content-comment) .reference-issue`).Attr("data-reference") assert.Equal(t, "/user2/repo1/issues/1#issuecomment-2", ref) } diff --git a/web_src/css/modules/checkbox.css b/web_src/css/modules/checkbox.css index f24b91df07..a6caf3324f 100644 --- a/web_src/css/modules/checkbox.css +++ b/web_src/css/modules/checkbox.css @@ -105,6 +105,7 @@ input[type="checkbox"]:indeterminate::before { vertical-align: middle; } +.ui.disabled.checkbox input, .ui.disabled.checkbox label, .ui.checkbox input[disabled] ~ label { cursor: default !important; diff --git a/web_src/css/repo.css b/web_src/css/repo.css index fb85dc8e9f..8a581750ee 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -423,28 +423,14 @@ td .commit-summary { margin-right: 5px; } -.repository.view.issue .comment-list:not(.prevent-before-timeline)::before { - display: block; - content: ""; - position: absolute; - margin-top: 12px; - margin-bottom: 14px; - top: 0; - bottom: 0; - left: 96px; - width: 2px; - background-color: var(--color-timeline); - z-index: -1; -} - -.repository.view.issue .comment-list .timeline { +.repository.view.issue .comment-list { position: relative; display: block; margin-left: 40px; padding-left: 16px; } -.repository.view.issue .comment-list .timeline::before { /* ciara */ +.repository.view.issue .comment-list::before { display: block; content: ""; position: absolute; @@ -1318,6 +1304,7 @@ td .commit-summary { display: flex; align-items: center; gap: 6px; + flex-wrap: wrap; } .comment-header-right { @@ -1844,26 +1831,23 @@ tbody.commit-list { } @media (max-width: 767.98px) { - .repository.view.issue .comment-list .timeline, + .repository.view.issue .comment-list, .repository.view.issue .comment-list .timeline-item { margin-left: 0; } - .repository.view.issue .comment-list .timeline::before { + .repository.view.issue .comment-list::before { left: 14px; } - .repository.view.issue .comment-list .timeline .inline-timeline-avatar { + .repository.view.issue .comment-list .inline-timeline-avatar { display: flex; margin-bottom: auto; margin-left: 6px; margin-right: 2px; } - .repository.view.issue .comment-list .timeline .comment-header { - padding-left: 4px; - } /* Don't show the general avatar, we show the inline avatar on mobile. * And don't show the role labels, there's no place for that. */ - .repository.view.issue .comment-list .timeline .timeline-avatar, - .repository.view.issue .comment-list .timeline .comment-header-right .role-label { + .repository.view.issue .comment-list .timeline-avatar, + .repository.view.issue .comment-list .comment-header-right .role-label { display: none; } .commit-header h3 { diff --git a/web_src/js/features/repo-issue-content.ts b/web_src/js/features/repo-issue-content.ts index 865d4305e4..e385d5b1e8 100644 --- a/web_src/js/features/repo-issue-content.ts +++ b/web_src/js/features/repo-issue-content.ts @@ -94,7 +94,7 @@ function showContentHistoryDetail(issueBaseUrl: string, commentId: string, histo function showContentHistoryMenu(issueBaseUrl: string, elCommentItem: Element, commentId: string) { const elHeaderLeft = elCommentItem.querySelector('.comment-header-left')!; const menuHtml = ` -
    +
    • ${i18nTextEdited}${svg('octicon-triangle-down', 14, 'dropdown icon')}
    @@ -127,7 +127,7 @@ export async function initRepoIssueContentHistory() { const issuePageInfo = parseIssuePageInfo(); if (!issuePageInfo.issueNumber) return; - const elIssueDescription = document.querySelector('.repository.issue .timeline-item.comment.first'); // issue(PR) main content + const elIssueDescription = document.querySelector('.repository.issue .timeline-item.comment.issue-content-comment'); // issue(PR) main content const elComments = document.querySelectorAll('.repository.issue .comment-list .comment'); // includes: issue(PR) comments, review comments, code comments if (!elIssueDescription && !elComments.length) return; diff --git a/web_src/js/features/repo-issue-pull.ts b/web_src/js/features/repo-issue-pull.ts index d16e865c70..7a72d267fc 100644 --- a/web_src/js/features/repo-issue-pull.ts +++ b/web_src/js/features/repo-issue-pull.ts @@ -1,51 +1,19 @@ import {createApp} from 'vue'; -import {GET, POST} from '../modules/fetch.ts'; +import {GET} from '../modules/fetch.ts'; import {fomanticQuery} from '../modules/fomantic/base.ts'; import {createElementFromHTML} from '../utils/dom.ts'; import {registerGlobalEventFunc} from '../modules/observer.ts'; -function initRepoPullRequestUpdate(el: HTMLElement) { - const prUpdateButtonContainer = el.querySelector('#update-pr-branch-with-base'); - if (!prUpdateButtonContainer) return; +export function initRepoPullRequestUpdate(el: HTMLElement) { + const elDropdown = el.querySelector(':scope > .ui.dropdown'); + if (!elDropdown) return; + const elButton = el.querySelector(':scope > button')!; - const prUpdateButton = prUpdateButtonContainer.querySelector(':scope > button')!; - const prUpdateDropdown = prUpdateButtonContainer.querySelector(':scope > .ui.dropdown')!; - prUpdateButton.addEventListener('click', async function (e) { - e.preventDefault(); - this.classList.add('is-loading'); - let response: Response | undefined; - try { - response = await POST(this.getAttribute('data-do')!); - } catch (error) { - console.error(error); - } finally { - this.classList.remove('is-loading'); - } - let data: Record | undefined; - try { - // TODO: the response is indeed not JSON, need to fix (see backend UpdatePullRequest) - data = await response?.json(); // the response is probably not a JSON - } catch (error) { - console.error(error); - } - if (data?.redirect) { - window.location.href = data.redirect; - } else { - window.location.reload(); - } - }); - - fomanticQuery(prUpdateDropdown).dropdown({ + fomanticQuery(elDropdown).dropdown({ onChange(_text: string, _value: string, $choice: any) { const choiceEl = $choice[0]; - const url = choiceEl.getAttribute('data-do'); - if (url) { - const buttonText = prUpdateButton.querySelector('.button-text'); - if (buttonText) { - buttonText.textContent = choiceEl.textContent; - } - prUpdateButton.setAttribute('data-do', url); - } + elButton.textContent = choiceEl.textContent; + elButton.setAttribute('data-url', choiceEl.getAttribute('data-update-url')); }, }); } @@ -69,7 +37,6 @@ async function initRepoPullRequestMergeForm(box: HTMLElement) { export function initRepoPullMergeBox(el: HTMLElement) { registerGlobalEventFunc('click', 'onCommitStatusChecksToggle', onCommitStatusChecksToggle); - initRepoPullRequestUpdate(el); initRepoPullRequestMergeForm(el); const reloadingIntervalValue = el.getAttribute('data-pull-merge-box-reloading-interval'); diff --git a/web_src/js/features/repo-legacy.ts b/web_src/js/features/repo-legacy.ts index fc92242b40..db91529535 100644 --- a/web_src/js/features/repo-legacy.ts +++ b/web_src/js/features/repo-legacy.ts @@ -17,7 +17,7 @@ import {initRepoMilestone} from './repo-milestone.ts'; import {initRepoNew} from './repo-new.ts'; import {createApp} from 'vue'; import RepoBranchTagSelector from '../components/RepoBranchTagSelector.vue'; -import {initRepoPullMergeBox} from './repo-issue-pull.ts'; +import {initRepoPullMergeBox, initRepoPullRequestUpdate} from './repo-issue-pull.ts'; function initRepoBranchTagSelector() { registerGlobalInitFunc('initRepoBranchTagSelector', async (elRoot: HTMLInputElement) => { @@ -38,6 +38,9 @@ export function initBranchSelectorTabs() { } export function initRepository() { + registerGlobalInitFunc('initRepoPullMergeBox', initRepoPullMergeBox); + registerGlobalInitFunc('initRepoPullRequestUpdate', initRepoPullRequestUpdate); + const pageContent = document.querySelector('.page-content.repository'); if (!pageContent) return; @@ -68,8 +71,6 @@ export function initRepository() { initRepoIssueCommentDelete(); initRepoIssueCodeCommentCancel(); initCompReactionSelector(); - - registerGlobalInitFunc('initRepoPullMergeBox', initRepoPullMergeBox); } initUnicodeEscapeButton(); From ee803ad05dea1417c99883903431f91ae3f136fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kalash=20Thakare=20=E2=98=AF=EF=B8=8E?= Date: Tue, 5 May 2026 21:49:52 +0530 Subject: [PATCH 06/20] fix(actions): validate workflow param to prevent 500 error (#37546) Fix #37523 --- routers/web/repo/actions/view.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index e17d6b42d7..07a7187955 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -1072,7 +1072,7 @@ func EnableWorkflowFile(ctx *context_module.Context) { func disableOrEnableWorkflowFile(ctx *context_module.Context, isEnable bool) { workflow := ctx.FormString("workflow") if len(workflow) == 0 { - ctx.ServerError("workflow", nil) + ctx.JSONError("workflow is required") return } From a5fd8e7e867270d24b488319189124d740e4f0cc Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 6 May 2026 00:41:49 +0800 Subject: [PATCH 07/20] Make ServeSetHeaders default to download attachment if filename exists (#37552) Fix #37550 --- modules/httplib/serve.go | 5 +++-- modules/httplib/serve_test.go | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go index 6c2fe9b0d6..d51c938bf0 100644 --- a/modules/httplib/serve.go +++ b/modules/httplib/serve.go @@ -87,8 +87,9 @@ func ServeSetHeaders(w http.ResponseWriter, opts ServeHeaderOptions) { if opts.ContentLength != nil { header.Set("Content-Length", strconv.FormatInt(*opts.ContentLength, 10)) } - if opts.Filename != "" && opts.ContentDisposition != "" { - header.Set("Content-Disposition", encodeContentDisposition(opts.ContentDisposition, path.Base(opts.Filename))) + if opts.Filename != "" { + contentDisposition := util.IfZero(opts.ContentDisposition, ContentDispositionAttachment) + header.Set("Content-Disposition", encodeContentDisposition(contentDisposition, path.Base(opts.Filename))) header.Set("Access-Control-Expose-Headers", "Content-Disposition") } diff --git a/modules/httplib/serve_test.go b/modules/httplib/serve_test.go index 2a245300b0..419085237c 100644 --- a/modules/httplib/serve_test.go +++ b/modules/httplib/serve_test.go @@ -133,3 +133,11 @@ func TestServeSetHeaderContentRelated(t *testing.T) { // make sure sandboxed require.Contains(t, serveHeaderCspDefault, "; sandbox") } + +func TestServeSetHeaders(t *testing.T) { + w := httptest.NewRecorder() + ServeSetHeaders(w, ServeHeaderOptions{Filename: "foo.zip"}) + assert.Equal(t, "attachment; filename=foo.zip", w.Header().Get("Content-Disposition")) + ServeSetHeaders(w, ServeHeaderOptions{Filename: "foo.zip", ContentDisposition: ContentDispositionInline}) + assert.Equal(t, "inline; filename=foo.zip", w.Header().Get("Content-Disposition")) +} From 45ffe5aa6ad1d5f5c4be45ccb7b338b937c73a1f Mon Sep 17 00:00:00 2001 From: Nicolas Date: Tue, 5 May 2026 19:24:09 +0200 Subject: [PATCH 08/20] ci: lint PR titles with commitlint (#37498) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary - Enforce **Conventional Commits** on PR titles (PRs are squash-merged, so the PR title becomes the final commit message). - Add a local `make lint-pr-title` target so contributors can validate titles before pushing. ## Why We squash-merge PRs, which means the final repository history is largely shaped by **PR titles**. Enforcing a consistent Conventional Commits format makes: - **Release notes & changelogs easier to generate** (types like `feat` / `fix` can be grouped automatically). - **History easier to scan** (uniform structure, optional scopes, explicit breaking changes via `!`). - **Automation more reliable** (future tooling can infer category and scope from the title). ## PR title format ```text type(scope)!: subject type: one of build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test scope: optional (e.g. web, api, actions, repo, …) !: optional, indicates a breaking change subject: short, imperative, no trailing period ``` ## Examples ```text feat(web): add dark mode toggle fix(api): avoid panic when repo is missing chore(ci): lint PR titles with commitlint refactor(templates): reduce duplication in repo list rendering feat!: remove legacy OAuth endpoint ``` ## Local testing ```text make deps-frontend make lint-pr-title PR_TITLE="feat(web): add dark mode toggle" ``` --------- Signed-off-by: Nicolas Co-authored-by: nb Co-authored-by: GPT-5.2 --- .github/pull_request_template.md | 13 +++++++------ .github/workflows/pull-pr-title.yml | 28 ++++++++++++++++++++++++++++ AGENTS.md | 1 + CONTRIBUTING.md | 16 ++++++++++++++++ Makefile | 4 ++++ tools/lint-pr-title.js | 19 +++++++++++++++++++ 6 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/pull-pr-title.yml create mode 100644 tools/lint-pr-title.js diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b7594a1ba7..91d001e078 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,10 +1,11 @@ Please check the following: 1. Make sure you are targeting the `main` branch, pull requests on release branches are only allowed for backports. -2. Make sure you have read contributing guidelines: https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md . -3. For documentations contribution, please go to https://gitea.com/gitea/docs -4. Describe what your pull request does and which issue you're targeting (if any). -5. It is recommended to enable "Allow edits by maintainers", so maintainers can help more easily. -6. Your input here will be included in the commit message when this PR has been merged. If you don't want some content to be included, please separate them with a line like `---`. -7. Delete all these tips before posting. +2. Use a Conventional Commits PR title, for example `fix(repo): handle empty branch names`. +3. Make sure you have read contributing guidelines: https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md . +4. For documentations contribution, please go to https://gitea.com/gitea/docs +5. Describe what your pull request does and which issue you're targeting (if any). +6. It is recommended to enable "Allow edits by maintainers", so maintainers can help more easily. +7. Your input here will be included in the commit message when this PR has been merged. If you don't want some content to be included, please separate them with a line like `---`. +8. Delete all these tips before posting. diff --git a/.github/workflows/pull-pr-title.yml b/.github/workflows/pull-pr-title.yml new file mode 100644 index 0000000000..59b0e78c40 --- /dev/null +++ b/.github/workflows/pull-pr-title.yml @@ -0,0 +1,28 @@ +name: pr-title + +on: + pull_request: + types: + - opened + - edited + - reopened + - synchronize + - ready_for_review + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + lint-pr-title: + if: github.event.pull_request.draft == false + runs-on: ubuntu-latest + timeout-minutes: 5 + steps: + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - run: make lint-pr-title + env: + PR_TITLE: ${{ github.event.pull_request.title }} diff --git a/AGENTS.md b/AGENTS.md index fd87f432b7..276023f234 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,6 +7,7 @@ - Run single playwright e2e test files with `GITEA_TEST_E2E_FLAGS='' make test-e2e` - Add the current year into the copyright header of new `.go` files - Ensure no trailing whitespace in edited files +- Use Conventional Commits format for commit messages and PR titles (e.g. `type(scope): subject`) - Never force-push, amend, or squash unless asked. Use new commits and normal push for pull request updates - Preserve existing code comments, do not remove or rewrite comments that are still relevant - In TypeScript, use `!` (non-null assertion) instead of `?.`/`??` when a value is known to always exist diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1871f1470..c62950d84b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -189,6 +189,22 @@ In the PR title, describe the problem you are fixing, not how you are fixing it. Use the first comment as a summary of your PR. \ In the PR summary, you can describe exactly how you are fixing this problem. +PR titles must follow the [Conventional Commits](https://www.conventionalcommits.org/) format, because PRs are squash-merged and the PR title becomes the resulting commit message: + +```text +type(scope)!: subject +``` + +The allowed types are `build`, `ci`, `docs`, `feat`, `fix`, `perf`, `refactor`, `revert`, `style`, and `test`. The generic `chore` type is intentionally not accepted; pick a more descriptive type instead. + +Examples: + +```text +fix(web): prevent avatar upload crash on empty file +feat(api): add pagination to repo hooks list +ci(workflows): lint PR titles with commitlint +``` + Keep this summary up-to-date as the PR evolves. \ If your PR changes the UI, you must add **after** screenshots in the PR summary. \ If you are not implementing a new feature, you should also post **before** screenshots for comparison. diff --git a/Makefile b/Makefile index 2466435b17..b6aa9371e5 100644 --- a/Makefile +++ b/Makefile @@ -321,6 +321,10 @@ lint-md: node_modules ## lint markdown files lint-md-fix: node_modules ## lint markdown files and fix issues pnpm exec markdownlint --fix *.md +.PHONY: lint-pr-title +lint-pr-title: ## lint PR title against Conventional Commits (set PR_TITLE=...) + @node ./tools/lint-pr-title.js + .PHONY: lint-spell lint-spell: ## lint spelling @git ls-files $(SPELLCHECK_FILES) | xargs go run $(MISSPELL_PACKAGE) -dict assets/misspellings.csv -error diff --git a/tools/lint-pr-title.js b/tools/lint-pr-title.js new file mode 100644 index 0000000000..2df340f186 --- /dev/null +++ b/tools/lint-pr-title.js @@ -0,0 +1,19 @@ +#!/usr/bin/env node +import {env, exit} from 'node:process'; + +const allowedTypes = 'build, ci, docs, feat, fix, perf, refactor, revert, style, test'; +const title = env.PR_TITLE; + +if (!title) { + console.error('Missing PR_TITLE'); + exit(1); +} + +const validTitlePattern = new RegExp(`^(${allowedTypes.replaceAll(', ', '|')})(\\([\\w.-]+\\))?(!)?: .+$`); + +if (!validTitlePattern.test(title)) { + console.error(`Invalid PR title: ${title}`); + console.error('Expected format: type(scope): subject'); + console.error(`Allowed types: ${allowedTypes}`); + exit(1); +} From 97211bf0c5a4a45a098092773e80ca502af8355e Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 6 May 2026 05:54:31 +0200 Subject: [PATCH 09/20] refactor(deps): migrate from `nektos/act` fork to `gitea/runner` (#37557) Migrate to https://gitea.com/gitea/runner/releases/tag/v1.0.0 which includes the `act` package directory previously referenced by `nektos/act`. Signed-off-by: silverwind Co-authored-by: Claude (Opus 4.7) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- assets/go-licenses.json | 15 ++++++++++----- go.mod | 4 +--- go.sum | 7 ++++--- models/actions/artifact.go | 2 +- modules/actions/jobparser/evaluator.go | 2 +- modules/actions/jobparser/interpeter.go | 4 ++-- modules/actions/jobparser/jobparser.go | 4 ++-- modules/actions/jobparser/model.go | 2 +- modules/actions/jobparser/model_test.go | 2 +- modules/actions/workflows.go | 4 ++-- routers/api/v1/repo/action.go | 2 +- routers/web/repo/actions/actions.go | 2 +- routers/web/repo/actions/actions_test.go | 2 +- routers/web/repo/actions/view.go | 2 +- services/actions/concurrency.go | 2 +- services/actions/context.go | 2 +- services/actions/context_test.go | 2 +- services/actions/notifier_helper.go | 2 +- services/actions/rerun.go | 2 +- services/actions/run.go | 2 +- services/actions/workflow.go | 2 +- services/convert/convert.go | 2 +- 22 files changed, 37 insertions(+), 33 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index 0f2913a6ad..7bfd1fceeb 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -39,6 +39,16 @@ "path": "filippo.io/edwards25519/LICENSE", "licenseText": "Copyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, + { + "name": "gitea.com/gitea/runner", + "path": "gitea.com/gitea/runner/LICENSE", + "licenseText": "Copyright (c) 2022 The Gitea Authors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" + }, + { + "name": "gitea.com/gitea/runner/act", + "path": "gitea.com/gitea/runner/act/LICENSE", + "licenseText": "MIT License\n\nCopyright (c) 2022 The Gitea Authors\nCopyright (c) 2019\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" + }, { "name": "gitea.com/go-chi/binding", "path": "gitea.com/go-chi/binding/LICENSE", @@ -959,11 +969,6 @@ "path": "github.com/munnerz/goautoneg/LICENSE", "licenseText": "Copyright (c) 2011, Open Knowledge Foundation Ltd.\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n Redistributions of source code must retain the above copyright\n notice, this list of conditions and the following disclaimer.\n\n Redistributions in binary form must reproduce the above copyright\n notice, this list of conditions and the following disclaimer in\n the documentation and/or other materials provided with the\n distribution.\n\n Neither the name of the Open Knowledge Foundation Ltd. nor the\n names of its contributors may be used to endorse or promote\n products derived from this software without specific prior written\n permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nHOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, - { - "name": "github.com/nektos/act", - "path": "github.com/nektos/act/LICENSE", - "licenseText": "MIT License\n\nCopyright (c) 2022 The Gitea Authors\nCopyright (c) 2019\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" - }, { "name": "github.com/niklasfasching/go-org", "path": "github.com/niklasfasching/go-org/LICENSE", diff --git a/go.mod b/go.mod index 4cd9a77a1f..f113a29b18 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( code.gitea.io/sdk/gitea v0.24.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 connectrpc.com/connect v1.19.2 + gitea.com/gitea/runner v1.0.0 gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a gitea.com/go-chi/cache v0.2.1 gitea.com/go-chi/captcha v0.0.0-20240315150714-fb487f629098 @@ -85,7 +86,6 @@ require ( github.com/microsoft/go-mssqldb v1.9.6 github.com/minio/minio-go/v7 v7.1.0 github.com/msteinert/pam/v2 v2.1.0 - github.com/nektos/act v0.2.63 github.com/niklasfasching/go-org v1.9.1 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.1 @@ -301,8 +301,6 @@ ignore ( replace github.com/jaytaylor/html2text => github.com/Necoro/html2text v0.0.0-20250804200300-7bf1ce1c7347 // jaytaylor/html2text is unmaintained -replace github.com/nektos/act => gitea.com/gitea/act v0.261.10 // gitea maintains its own package - replace github.com/urfave/cli/v3 => github.com/urfave/cli/v3 v3.4.1 // v3.6.2 breaks -c flag parsing in help commands replace go.yaml.in/yaml/v4 => go.yaml.in/yaml/v4 v4.0.0-rc.3 // rc.4 changes block scalar serialization, wait for stable release diff --git a/go.sum b/go.sum index 2574251eec..c6387bd277 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -gitea.com/gitea/act v0.261.10 h1:ndwbtuMXXz1dpYF2iwY1/PkgKNETo4jmPXfinTZt8cs= -gitea.com/gitea/act v0.261.10/go.mod h1:oIkqQHvU0lfuIWwcpqa4FmU+t3prA89tgkuHUTsrI2c= +gitea.com/gitea/runner v1.0.0 h1:s3AS5u8r+B5W+Gy69sYYvCVTb0f23fRM6H+CbrFrobE= +gitea.com/gitea/runner v1.0.0/go.mod h1:bn+8Qt3KyvdVQHD3OR2yRoKgEXs8dXqwBVtmfYVrNIE= gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a h1:JHoBrfuTSF9Ke9aNfSYj1XRPBHjKPgCApVprnt2Am0M= gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a/go.mod h1:FOsLJIMdpiHzBp3Vby6Wfkdw2ppGscrjgU1IC7E4/zQ= gitea.com/go-chi/cache v0.2.1 h1:bfAPkvXlbcZxPCpcmDVCWoHgiBSBmZN/QosnZvEC0+g= @@ -686,8 +686,9 @@ github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4= +github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= diff --git a/models/actions/artifact.go b/models/actions/artifact.go index f0effdeeca..1de83a29c5 100644 --- a/models/actions/artifact.go +++ b/models/actions/artifact.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -// This artifact server is inspired by https://github.com/nektos/act/blob/master/pkg/artifacts/server.go. +// This artifact server is inspired by the Gitea runner artifact server implementation. // It updates url setting and uses ObjectStore to handle artifacts persistence. package actions diff --git a/modules/actions/jobparser/evaluator.go b/modules/actions/jobparser/evaluator.go index b320095071..3e314afb62 100644 --- a/modules/actions/jobparser/evaluator.go +++ b/modules/actions/jobparser/evaluator.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/nektos/act/pkg/exprparser" + "gitea.com/gitea/runner/act/exprparser" "go.yaml.in/yaml/v4" ) diff --git a/modules/actions/jobparser/interpeter.go b/modules/actions/jobparser/interpeter.go index 512b6f02ab..37defeff7a 100644 --- a/modules/actions/jobparser/interpeter.go +++ b/modules/actions/jobparser/interpeter.go @@ -4,8 +4,8 @@ package jobparser import ( - "github.com/nektos/act/pkg/exprparser" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/exprparser" + "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) diff --git a/modules/actions/jobparser/jobparser.go b/modules/actions/jobparser/jobparser.go index 76f229a54b..f2ab0ad3c9 100644 --- a/modules/actions/jobparser/jobparser.go +++ b/modules/actions/jobparser/jobparser.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "github.com/nektos/act/pkg/exprparser" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/exprparser" + "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) diff --git a/modules/actions/jobparser/model.go b/modules/actions/jobparser/model.go index 7132c278e9..2c4bd1f93a 100644 --- a/modules/actions/jobparser/model.go +++ b/modules/actions/jobparser/model.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) diff --git a/modules/actions/jobparser/model_test.go b/modules/actions/jobparser/model_test.go index d0e8204161..bd29cb9425 100644 --- a/modules/actions/jobparser/model_test.go +++ b/modules/actions/jobparser/model_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.yaml.in/yaml/v4" diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index ba1aee7d72..0269e8b0bb 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -17,8 +17,8 @@ import ( "code.gitea.io/gitea/modules/util" webhook_module "code.gitea.io/gitea/modules/webhook" - "github.com/nektos/act/pkg/model" - "github.com/nektos/act/pkg/workflowpattern" + "gitea.com/gitea/runner/act/model" + "gitea.com/gitea/runner/act/workflowpattern" "go.yaml.in/yaml/v4" ) diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index 1d38cc2f53..09b0cc5b2d 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -35,7 +35,7 @@ import ( "code.gitea.io/gitea/services/convert" secret_service "code.gitea.io/gitea/services/secrets" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" ) // ListActionsSecrets list an repo's actions secrets diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 1e9f596fc4..5c454dac24 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -28,7 +28,7 @@ import ( "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/convert" - act_model "github.com/nektos/act/pkg/model" + act_model "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) diff --git a/routers/web/repo/actions/actions_test.go b/routers/web/repo/actions/actions_test.go index 9e83ff0fbb..3925337844 100644 --- a/routers/web/repo/actions/actions_test.go +++ b/routers/web/repo/actions/actions_test.go @@ -11,7 +11,7 @@ import ( "code.gitea.io/gitea/models/db" unittest "code.gitea.io/gitea/models/unittest" - act_model "github.com/nektos/act/pkg/model" + act_model "gitea.com/gitea/runner/act/model" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 07a7187955..3ce4337fbc 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -35,7 +35,7 @@ import ( actions_service "code.gitea.io/gitea/services/actions" context_module "code.gitea.io/gitea/services/context" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" ) func findCurrentJobByPathParam(ctx *context_module.Context, jobs []*actions_model.ActionRunJob) (job *actions_model.ActionRunJob, hasPathParam bool) { diff --git a/services/actions/concurrency.go b/services/actions/concurrency.go index e1ec549930..990c0e9a0b 100644 --- a/services/actions/concurrency.go +++ b/services/actions/concurrency.go @@ -12,7 +12,7 @@ import ( "code.gitea.io/gitea/modules/json" api "code.gitea.io/gitea/modules/structs" - act_model "github.com/nektos/act/pkg/model" + act_model "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) diff --git a/services/actions/context.go b/services/actions/context.go index 9250c40983..1d4a08459d 100644 --- a/services/actions/context.go +++ b/services/actions/context.go @@ -18,7 +18,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" ) type GiteaContext map[string]any diff --git a/services/actions/context_test.go b/services/actions/context_test.go index 22f9abcce8..d86ec47a3c 100644 --- a/services/actions/context_test.go +++ b/services/actions/context_test.go @@ -10,7 +10,7 @@ import ( actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/unittest" - act_model "github.com/nektos/act/pkg/model" + act_model "gitea.com/gitea/runner/act/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 4d2a7113b9..3021f5bd0e 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -28,7 +28,7 @@ import ( webhook_module "code.gitea.io/gitea/modules/webhook" "code.gitea.io/gitea/services/convert" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" ) type methodCtxKeyType struct{} diff --git a/services/actions/rerun.go b/services/actions/rerun.go index f253181a8d..d4027b7c02 100644 --- a/services/actions/rerun.go +++ b/services/actions/rerun.go @@ -17,7 +17,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) diff --git a/services/actions/run.go b/services/actions/run.go index 162e3678ae..ed3b3728f7 100644 --- a/services/actions/run.go +++ b/services/actions/run.go @@ -12,7 +12,7 @@ import ( "code.gitea.io/gitea/modules/actions/jobparser" "code.gitea.io/gitea/modules/util" - act_model "github.com/nektos/act/pkg/model" + act_model "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) diff --git a/services/actions/workflow.go b/services/actions/workflow.go index b41741403f..44dad71c4a 100644 --- a/services/actions/workflow.go +++ b/services/actions/workflow.go @@ -22,7 +22,7 @@ import ( "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/convert" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) diff --git a/services/convert/convert.go b/services/convert/convert.go index a7622644d8..dc1692b6ca 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -38,7 +38,7 @@ import ( "code.gitea.io/gitea/services/gitdiff" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" - "github.com/nektos/act/pkg/model" + "gitea.com/gitea/runner/act/model" ) // ToEmail convert models.EmailAddress to api.Email From 35dfc6b9e1fcc6105416c9845a139487d27d2230 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 5 May 2026 23:58:09 -0700 Subject: [PATCH 10/20] fix(deps): update go dependencies (#37541) Co-authored-by: silverwind Co-authored-by: Claude (Opus 4.7) Co-authored-by: Nicolas --- go.mod | 14 ++++++-------- go.sum | 8 ++++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index f113a29b18..bcab996a71 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 github.com/42wim/httpsig v1.2.4 github.com/42wim/sshsig v0.0.0-20260317195500-b9f38cf0d432 - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0 - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2 + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 + github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3 github.com/Azure/go-ntlmssp v0.1.1 github.com/ProtonMail/go-crypto v1.4.1 github.com/PuerkitoBio/goquery v1.12.0 @@ -35,7 +35,7 @@ require ( github.com/bohde/codel v0.2.0 github.com/buildkite/terminal-to-html/v3 v3.16.8 github.com/caddyserver/certmagic v0.25.3 - github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20251013092601-6327009efd21 + github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20260309112543-12416315a635 github.com/chi-middleware/proxy v1.1.1 github.com/dimiro1/reply v0.0.0-20200315094148-d0136a4c9e21 github.com/dlclark/regexp2 v1.12.0 @@ -71,7 +71,7 @@ require ( github.com/hashicorp/go-version v1.9.0 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/huandu/xstrings v1.5.0 - github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 + github.com/jaytaylor/html2text v0.0.0-20260303211410-1a4bdc82ecec github.com/jhillyerd/enmime/v2 v2.3.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/klauspost/compress v1.18.6 @@ -83,7 +83,7 @@ require ( github.com/meilisearch/meilisearch-go v0.36.2 github.com/mholt/archives v0.1.5 github.com/microcosm-cc/bluemonday v1.0.27 - github.com/microsoft/go-mssqldb v1.9.6 + github.com/microsoft/go-mssqldb v1.9.7 github.com/minio/minio-go/v7 v7.1.0 github.com/msteinert/pam/v2 v2.1.0 github.com/niklasfasching/go-org v1.9.1 @@ -102,7 +102,7 @@ require ( github.com/tstranex/u2f v1.0.0 github.com/ulikunitz/xz v0.5.15 github.com/urfave/cli-docs/v3 v3.1.0 - github.com/urfave/cli/v3 v3.4.1 + github.com/urfave/cli/v3 v3.6.1 github.com/wneessen/go-mail v0.7.2 github.com/xeipuuv/gojsonschema v1.2.0 github.com/yohcop/openid-go v1.0.1 @@ -301,8 +301,6 @@ ignore ( replace github.com/jaytaylor/html2text => github.com/Necoro/html2text v0.0.0-20250804200300-7bf1ce1c7347 // jaytaylor/html2text is unmaintained -replace github.com/urfave/cli/v3 => github.com/urfave/cli/v3 v3.4.1 // v3.6.2 breaks -c flag parsing in help commands - replace go.yaml.in/yaml/v4 => go.yaml.in/yaml/v4 v4.0.0-rc.3 // rc.4 changes block scalar serialization, wait for stable release replace github.com/Azure/azure-sdk-for-go/sdk/azcore => github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0 // v1.21.0+ uses API version unsupported by Azurite in CI diff --git a/go.sum b/go.sum index c6387bd277..26c1df50ed 100644 --- a/go.sum +++ b/go.sum @@ -195,8 +195,8 @@ github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a h1:MISbI8sU/PSK/ github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a/go.mod h1:2GxOXOlEPAMFPfp014mK1SWq8G8BN8o7/dfYqJrVGn8= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20251013092601-6327009efd21 h1:2d64+4Jek9vjYwhY93AjbleiVH+AeWvPwPmDi1mfKFQ= -github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20251013092601-6327009efd21/go.mod h1:fNlYtCHWTRC8MofQERZkVUNUWaOvZeTBqHn/amSbKZI= +github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20260309112543-12416315a635 h1:RwCfD5XyO8jAermEy6pauh5Q5o6mCvbeNcCPOZlIA5o= +github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20260309112543-12416315a635/go.mod h1:R+SetERD4+IL7QH0WHp9MLifvITvh9gL3g8vX1j2Fcs= github.com/chi-middleware/proxy v1.1.1 h1:4HaXUp8o2+bhHr1OhVy+VjN0+L7/07JDcn6v7YrTjrQ= github.com/chi-middleware/proxy v1.1.1/go.mod h1:jQwMEJct2tz9VmtCELxvnXoMfa+SOdikvbVJVHv/M+0= github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= @@ -720,8 +720,8 @@ github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs= github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= github.com/urfave/cli-docs/v3 v3.1.0 h1:Sa5xm19IpE5gpm6tZzXdfjdFxn67PnEsE4dpXF7vsKw= github.com/urfave/cli-docs/v3 v3.1.0/go.mod h1:59d+5Hz1h6GSGJ10cvcEkbIe3j233t4XDqI72UIx7to= -github.com/urfave/cli/v3 v3.4.1 h1:1M9UOCy5bLmGnuu1yn3t3CB4rG79Rtoxuv1sPhnm6qM= -github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= +github.com/urfave/cli/v3 v3.6.1 h1:j8Qq8NyUawj/7rTYdBGrxcH7A/j7/G8Q5LhWEW4G3Mo= +github.com/urfave/cli/v3 v3.6.1/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/wneessen/go-mail v0.7.2 h1:xxPnhZ6IZLSgxShebmZ6DPKh1b6OJcoHfzy7UjOkzS8= github.com/wneessen/go-mail v0.7.2/go.mod h1:+TkW6QP3EVkgTEqHtVmnAE/1MRhmzb8Y9/W3pweuS+k= From ebc058f6823a35321c90dbc8d0d972b10a56c93a Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 6 May 2026 18:37:09 +0200 Subject: [PATCH 11/20] ci: increase renovate frequency and fix RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS (#37565) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Sync `RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS` with the recent `renovate.json5` change (#37537) — the npm group now runs `make svg nolyfill`, but the workflow allowlist still only matched `^make (tidy|svg)$`, so the post-upgrade task was being rejected. 2. Bump the cron from daily at 01:00 UTC to hourly at :23, matching the cadence of Mend's hosted Renovate App. Hourly gives sub-hour responsiveness to dependency-dashboard checkbox interactions and PR-close reactions; the `:23` offset avoids the GHA scheduler congestion at multiples of 15. Co-authored-by: Claude (Opus 4.7) --- .github/workflows/cron-renovate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cron-renovate.yml b/.github/workflows/cron-renovate.yml index c4906552d5..9ebe1fec32 100644 --- a/.github/workflows/cron-renovate.yml +++ b/.github/workflows/cron-renovate.yml @@ -2,7 +2,7 @@ name: cron-renovate on: schedule: - - cron: "0 1 * * *" # daily at 01:00 UTC + - cron: "23 * * * *" # hourly at :23 workflow_dispatch: concurrency: @@ -28,5 +28,5 @@ jobs: token: ${{ secrets.RENOVATE_TOKEN }} env: RENOVATE_BINARY_SOURCE: install # auto-install go/node toolchains needed by post-upgrade tasks. - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^make (tidy|svg)$"]' + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^make (tidy|svg nolyfill)$"]' RENOVATE_REPOSITORIES: '["go-gitea/gitea"]' From b093c2c43c7a218c704fdb063d818c98de11b916 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 6 May 2026 18:21:48 +0000 Subject: [PATCH 12/20] refactor(templates): remove ctxData from tmpl files, use ctx.RootData instead (#37567) Sub-templates have direct access to `ctx.RootData` (the root data map), so there is no need for callers to explicitly pass it as `ctxData` via `dict`. Also fix #37569 by the way --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com> Co-authored-by: wxiaoguang --- templates/admin/actions.tmpl | 2 +- templates/admin/applications/list.tmpl | 2 +- templates/admin/applications/oauth2_edit.tmpl | 2 +- templates/admin/auth/edit.tmpl | 2 +- templates/admin/auth/list.tmpl | 2 +- templates/admin/auth/new.tmpl | 2 +- templates/admin/badge/edit.tmpl | 2 +- templates/admin/badge/list.tmpl | 2 +- templates/admin/badge/new.tmpl | 2 +- templates/admin/badge/users.tmpl | 2 +- templates/admin/badge/view.tmpl | 2 +- templates/admin/config.tmpl | 2 +- .../config_settings/config_settings.tmpl | 2 +- templates/admin/cron.tmpl | 2 +- templates/admin/dashboard.tmpl | 2 +- templates/admin/emails/list.tmpl | 2 +- templates/admin/hook_new.tmpl | 4 +-- templates/admin/hooks.tmpl | 2 +- templates/admin/layout_head.tmpl | 8 ++--- templates/admin/notice.tmpl | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/perftrace.tmpl | 2 +- templates/admin/queue.tmpl | 2 +- templates/admin/queue_manage.tmpl | 2 +- templates/admin/repo/list.tmpl | 2 +- templates/admin/repo/unadopted.tmpl | 2 +- templates/admin/runners/edit.tmpl | 2 +- templates/admin/self_check.tmpl | 2 +- templates/admin/stacktrace.tmpl | 2 +- templates/admin/stats.tmpl | 2 +- templates/admin/user/edit.tmpl | 2 +- templates/admin/user/list.tmpl | 2 +- templates/admin/user/new.tmpl | 2 +- templates/admin/user/view.tmpl | 2 +- templates/org/settings/actions.tmpl | 2 +- templates/org/settings/actions_general.tmpl | 2 +- templates/org/settings/applications.tmpl | 2 +- .../settings/applications_oauth2_edit.tmpl | 2 +- templates/org/settings/blocked_users.tmpl | 2 +- templates/org/settings/hook_new.tmpl | 4 +-- templates/org/settings/hooks.tmpl | 2 +- templates/org/settings/labels.tmpl | 2 +- templates/org/settings/layout_head.tmpl | 10 +++---- templates/org/settings/options.tmpl | 2 +- templates/org/settings/packages.tmpl | 2 +- .../settings/packages_cleanup_rules_edit.tmpl | 2 +- .../packages_cleanup_rules_preview.tmpl | 2 +- templates/org/settings/runners_edit.tmpl | 2 +- .../repo/issue/view_content/comments.tmpl | 16 +++++----- .../view_content/comments_authorlink.tmpl | 6 ++-- .../view_content/comments_delete_time.tmpl | 6 ++-- templates/repo/settings/actions.tmpl | 2 +- templates/repo/settings/branches.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 2 +- templates/repo/settings/deploy_keys.tmpl | 2 +- templates/repo/settings/githook_edit.tmpl | 2 +- templates/repo/settings/githooks.tmpl | 2 +- templates/repo/settings/layout_head.tmpl | 10 +++---- templates/repo/settings/lfs.tmpl | 2 +- templates/repo/settings/lfs_file.tmpl | 2 +- templates/repo/settings/lfs_file_find.tmpl | 2 +- templates/repo/settings/lfs_locks.tmpl | 2 +- templates/repo/settings/lfs_pointers.tmpl | 2 +- templates/repo/settings/options.tmpl | 2 +- templates/repo/settings/protected_branch.tmpl | 2 +- templates/repo/settings/public_access.tmpl | 2 +- templates/repo/settings/runner_edit.tmpl | 2 +- templates/repo/settings/secrets.tmpl | 2 +- templates/repo/settings/tags.tmpl | 2 +- templates/repo/settings/webhook/base.tmpl | 2 +- templates/repo/settings/webhook/new.tmpl | 4 +-- templates/user/settings/account.tmpl | 2 +- templates/user/settings/actions.tmpl | 2 +- templates/user/settings/actions_general.tmpl | 2 +- templates/user/settings/appearance.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- .../settings/applications_oauth2_edit.tmpl | 2 +- templates/user/settings/blocked_users.tmpl | 2 +- templates/user/settings/hook_new.tmpl | 4 +-- templates/user/settings/hooks.tmpl | 2 +- templates/user/settings/keys.tmpl | 2 +- templates/user/settings/layout_head.tmpl | 8 ++--- templates/user/settings/notifications.tmpl | 2 +- templates/user/settings/organization.tmpl | 2 +- templates/user/settings/packages.tmpl | 2 +- .../settings/packages_cleanup_rules_edit.tmpl | 2 +- .../packages_cleanup_rules_preview.tmpl | 2 +- templates/user/settings/profile.tmpl | 2 +- templates/user/settings/repos.tmpl | 2 +- templates/user/settings/runner_edit.tmpl | 2 +- .../user/settings/security/security.tmpl | 2 +- .../user/settings/security/twofa_enroll.tmpl | 2 +- templates/webhook/new.tmpl | 30 +++++++++---------- web_src/css/repo.css | 6 ++-- 95 files changed, 140 insertions(+), 140 deletions(-) diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl index 597863d73b..1bddb674c0 100644 --- a/templates/admin/actions.tmpl +++ b/templates/admin/actions.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin actions")}} +{{template "admin/layout_head" (dict "pageClass" "admin actions")}}
    {{if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl index cbb66b1605..efc4e6e0df 100644 --- a/templates/admin/applications/list.tmpl +++ b/templates/admin/applications/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +{{template "admin/layout_head" (dict "pageClass" "admin config")}}

    {{ctx.Locale.Tr "settings.applications"}} diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl index 668bfe0633..34ae0bf4bf 100644 --- a/templates/admin/applications/oauth2_edit.tmpl +++ b/templates/admin/applications/oauth2_edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +{{template "admin/layout_head" (dict "pageClass" "admin config")}}
    {{template "user/settings/applications_oauth2_edit_form" .}} diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 60480ce82f..40f19667b3 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}} +{{template "admin/layout_head" (dict "pageClass" "admin edit authentication")}}

    {{ctx.Locale.Tr "admin.auths.edit"}} diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index 7296e95558..17795880ea 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}} +{{template "admin/layout_head" (dict "pageClass" "admin authentication")}}

    {{ctx.Locale.Tr "admin.auths.auth_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 256f648c6a..6bc273c80d 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}} +{{template "admin/layout_head" (dict "pageClass" "admin new authentication")}}

    {{ctx.Locale.Tr "admin.auths.new"}} diff --git a/templates/admin/badge/edit.tmpl b/templates/admin/badge/edit.tmpl index f2cdc4ad44..582ba60cd6 100644 --- a/templates/admin/badge/edit.tmpl +++ b/templates/admin/badge/edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit badge")}} +{{template "admin/layout_head" (dict "pageClass" "admin edit badge")}}

    {{ctx.Locale.Tr "admin.badges.edit_badge"}} diff --git a/templates/admin/badge/list.tmpl b/templates/admin/badge/list.tmpl index 3020b7b25a..691bc44811 100644 --- a/templates/admin/badge/list.tmpl +++ b/templates/admin/badge/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin badge")}} +{{template "admin/layout_head" (dict "pageClass" "admin badge")}}

    {{ctx.Locale.Tr "admin.badges.badges_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/badge/new.tmpl b/templates/admin/badge/new.tmpl index 5b67bed314..0c64c39608 100644 --- a/templates/admin/badge/new.tmpl +++ b/templates/admin/badge/new.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new badge")}} +{{template "admin/layout_head" (dict "pageClass" "admin new badge")}}

    {{ctx.Locale.Tr "admin.badges.new_badge"}} diff --git a/templates/admin/badge/users.tmpl b/templates/admin/badge/users.tmpl index 711110ca68..89d2597310 100644 --- a/templates/admin/badge/users.tmpl +++ b/templates/admin/badge/users.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin badge")}} +{{template "admin/layout_head" (dict "pageClass" "admin badge")}}

    {{.Title}} diff --git a/templates/admin/badge/view.tmpl b/templates/admin/badge/view.tmpl index cbe5c7b710..26d3d8dbe6 100644 --- a/templates/admin/badge/view.tmpl +++ b/templates/admin/badge/view.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" .)}} +{{template "admin/layout_head" (dict)}}
    diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index c381c5bf1d..ae37950fb5 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +{{template "admin/layout_head" (dict "pageClass" "admin config")}}

    {{ctx.Locale.Tr "admin.config.server_config"}} diff --git a/templates/admin/config_settings/config_settings.tmpl b/templates/admin/config_settings/config_settings.tmpl index 6d1db4f89f..b12c2dc395 100644 --- a/templates/admin/config_settings/config_settings.tmpl +++ b/templates/admin/config_settings/config_settings.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config" "dataGlobalInit" "initAdminConfigSettings")}} +{{template "admin/layout_head" (dict "pageClass" "admin config" "dataGlobalInit" "initAdminConfigSettings")}} {{template "admin/config_settings/avatars" .}} {{template "admin/config_settings/repository" .}} diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl index 8e44614d97..457cdd5212 100644 --- a/templates/admin/cron.tmpl +++ b/templates/admin/cron.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}

    {{ctx.Locale.Tr "admin.monitor.cron"}} diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index f44dc24362..059ddd3c7e 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}} +{{template "admin/layout_head" (dict "pageClass" "admin dashboard")}}
    {{if .NeedUpdate}}
    diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index d597a2753f..135b4da3a0 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "pageClass" "admin user")}}

    {{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index 37dcc49d53..d8df205449 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}} +{{template "admin/layout_head" (dict "pageClass" "admin settings new webhook")}}
    {{$CustomHeaderTitle := ctx.Locale.Tr "admin.defaulthooks.update_webhook"}} {{if .PageIsAdminDefaultHooksNew}} @@ -8,6 +8,6 @@ {{else if .Webhook.IsSystemWebhook}} {{$CustomHeaderTitle = ctx.Locale.Tr "admin.systemhooks.update_webhook"}} {{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{template "webhook/new" (dict "CustomHeaderTitle" $CustomHeaderTitle)}}
    {{template "admin/layout_footer" .}} diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl index d5fdef6850..c36a9b10eb 100644 --- a/templates/admin/hooks.tmpl +++ b/templates/admin/hooks.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}} +{{template "admin/layout_head" (dict "pageClass" "admin hooks")}}
    {{template "repo/settings/webhook/base_list" .SystemWebhooks}} {{template "repo/settings/webhook/base_list" .DefaultWebhooks}} diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl index 397516da5d..ce989c40c8 100644 --- a/templates/admin/layout_head.tmpl +++ b/templates/admin/layout_head.tmpl @@ -1,9 +1,9 @@ -{{template "base/head" .ctxData}} -
    +{{template "base/head" ctx.RootData}} +
    - {{template "admin/navbar" .ctxData}} + {{template "admin/navbar" ctx.RootData}}
    - {{template "base/alert" .ctxData}} + {{template "base/alert" ctx.RootData}} {{/* block: admin-setting-content */}} {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 55ee9da852..c4c29fc830 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}} +{{template "admin/layout_head" (dict "pageClass" "admin notice")}}

    {{ctx.Locale.Tr "admin.notices.system_notice_list"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index e6de93c5f8..ad2bb46167 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "pageClass" "admin user")}}

    {{ctx.Locale.Tr "admin.orgs.org_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 8701cb0d57..800f8dac5b 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "pageClass" "admin user")}}

    {{ctx.Locale.Tr "admin.packages.package_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .TotalCount}}, diff --git a/templates/admin/perftrace.tmpl b/templates/admin/perftrace.tmpl index 2e09f14e46..6b302f2996 100644 --- a/templates/admin/perftrace.tmpl +++ b/templates/admin/perftrace.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}
    {{template "admin/trace_tabs" .}} diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index e6abd1e794..b3804980ce 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}

    {{ctx.Locale.Tr "admin.monitor.queues"}} diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index 73da9164cc..a57273f055 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}

    {{ctx.Locale.Tr "admin.monitor.queue" .Queue.GetName}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index c72daba322..d366b8cb2d 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}} +{{template "admin/layout_head" (dict "pageClass" "admin")}}

    {{ctx.Locale.Tr "admin.repos.repo_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index e66add6ce8..db27b11ac5 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}} +{{template "admin/layout_head" (dict "pageClass" "admin")}}

    {{ctx.Locale.Tr "admin.repos.unadopted"}} diff --git a/templates/admin/runners/edit.tmpl b/templates/admin/runners/edit.tmpl index 1165c84b79..7d7fee1505 100644 --- a/templates/admin/runners/edit.tmpl +++ b/templates/admin/runners/edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}} +{{template "admin/layout_head" (dict "pageClass" "admin runners")}}
    {{template "shared/actions/runner_edit" .}}
    diff --git a/templates/admin/self_check.tmpl b/templates/admin/self_check.tmpl index a7f43f4e12..31d6a5d516 100644 --- a/templates/admin/self_check.tmpl +++ b/templates/admin/self_check.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}} +{{template "admin/layout_head" (dict "pageClass" "admin")}}

    diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index c5dde6b30c..a74a3d3e41 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}
    {{template "admin/trace_tabs" .}} diff --git a/templates/admin/stats.tmpl b/templates/admin/stats.tmpl index bb6a86ac30..610c2860a3 100644 --- a/templates/admin/stats.tmpl +++ b/templates/admin/stats.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}

    {{ctx.Locale.Tr "admin.dashboard.statistic"}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 83eac64fa0..0563cf63b4 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit user")}} +{{template "admin/layout_head" (dict "pageClass" "admin edit user")}}

    {{ctx.Locale.Tr "admin.users.edit_account"}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 168603354d..db7cb4874f 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "pageClass" "admin user")}}

    {{ctx.Locale.Tr "admin.users.user_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 8af7f116a1..8fe91bd343 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new user")}} +{{template "admin/layout_head" (dict "pageClass" "admin new user")}}

    {{ctx.Locale.Tr "admin.users.new_account"}} diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index 67f9148e64..bb1b4991d8 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin view user")}} +{{template "admin/layout_head" (dict "pageClass" "admin view user")}}
    diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index abb9c98435..1abf895627 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings actions")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings actions")}}
    {{if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} diff --git a/templates/org/settings/actions_general.tmpl b/templates/org/settings/actions_general.tmpl index ebf9482f61..2d2c4a4ca0 100644 --- a/templates/org/settings/actions_general.tmpl +++ b/templates/org/settings/actions_general.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" .)}} +{{template "org/settings/layout_head" (dict)}}
    {{template "shared/actions/owner_general_settings" .}}
    diff --git a/templates/org/settings/applications.tmpl b/templates/org/settings/applications.tmpl index df5f4e9dbc..eb12d3fa2a 100644 --- a/templates/org/settings/applications.tmpl +++ b/templates/org/settings/applications.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings options")}}

    {{ctx.Locale.Tr "settings.applications"}} diff --git a/templates/org/settings/applications_oauth2_edit.tmpl b/templates/org/settings/applications_oauth2_edit.tmpl index 987803ac26..7fdbc94058 100644 --- a/templates/org/settings/applications_oauth2_edit.tmpl +++ b/templates/org/settings/applications_oauth2_edit.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings options")}}
    {{template "user/settings/applications_oauth2_edit_form" .}}
    diff --git a/templates/org/settings/blocked_users.tmpl b/templates/org/settings/blocked_users.tmpl index eab5ec0007..4444048f7a 100644 --- a/templates/org/settings/blocked_users.tmpl +++ b/templates/org/settings/blocked_users.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings blocked_users")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings blocked_users")}}
    {{template "shared/user/blocked_users" .}}
    diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index f89ee5f2b8..11f71d9059 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -1,7 +1,7 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings new webhook")}}
    {{$CustomHeaderTitle := ctx.Locale.Tr "repo.settings.update_webhook"}} {{if .PageIsSettingsHooksNew}}{{$CustomHeaderTitle = ctx.Locale.Tr "repo.settings.add_webhook"}}{{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{template "webhook/new" (dict "CustomHeaderTitle" $CustomHeaderTitle)}}
    {{template "org/settings/layout_footer" .}} diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl index b05e22fe20..dbb1721fff 100644 --- a/templates/org/settings/hooks.tmpl +++ b/templates/org/settings/hooks.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings webhooks")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings webhooks")}}
    {{template "repo/settings/webhook/base_list" .}}
    diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 283b2199cb..4246c7305e 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings labels")}}
    diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl index 31dad2c141..97515d89ef 100644 --- a/templates/org/settings/layout_head.tmpl +++ b/templates/org/settings/layout_head.tmpl @@ -1,10 +1,10 @@ -{{template "base/head" .ctxData}} -
    - {{template "org/header" .ctxData}} +{{template "base/head" ctx.RootData}} +
    + {{template "org/header" ctx.RootData}}
    - {{template "org/settings/navbar" .ctxData}} + {{template "org/settings/navbar" ctx.RootData}}
    - {{template "base/alert" .ctxData}} + {{template "base/alert" ctx.RootData}} {{/* block: org-setting-content */}} {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 2c17e13937..614e861b09 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings options")}}

    diff --git a/templates/org/settings/packages.tmpl b/templates/org/settings/packages.tmpl index 91106c3f15..a73ab97a37 100644 --- a/templates/org/settings/packages.tmpl +++ b/templates/org/settings/packages.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings packages")}}
    {{template "package/shared/cleanup_rules/list" .}} {{template "package/shared/cargo" .}} diff --git a/templates/org/settings/packages_cleanup_rules_edit.tmpl b/templates/org/settings/packages_cleanup_rules_edit.tmpl index ff4c2dd651..a6359416c0 100644 --- a/templates/org/settings/packages_cleanup_rules_edit.tmpl +++ b/templates/org/settings/packages_cleanup_rules_edit.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings packages")}}
    {{template "package/shared/cleanup_rules/edit" .}}
    diff --git a/templates/org/settings/packages_cleanup_rules_preview.tmpl b/templates/org/settings/packages_cleanup_rules_preview.tmpl index 5a2f061225..973413c440 100644 --- a/templates/org/settings/packages_cleanup_rules_preview.tmpl +++ b/templates/org/settings/packages_cleanup_rules_preview.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings packages")}}
    {{template "package/shared/cleanup_rules/preview" .}}
    diff --git a/templates/org/settings/runners_edit.tmpl b/templates/org/settings/runners_edit.tmpl index acd67a4d7b..b87c6c1091 100644 --- a/templates/org/settings/runners_edit.tmpl +++ b/templates/org/settings/runners_edit.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings runners")}}
    {{template "shared/actions/runner_edit" .}}
    diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index ad26d4da88..d5c0b5d7df 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -86,7 +86,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{if .Issue.IsPull}} {{ctx.Locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr}} {{else}} @@ -101,7 +101,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{if .Issue.IsPull}} {{ctx.Locale.Tr "repo.pulls.closed_at" .EventTag $createdStr}} {{else}} @@ -116,7 +116,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{$link := printf "%s/commit/%s" $.Repository.Link ($.Issue.PullRequest.MergedCommitID|PathEscape)}} {{if eq $.Issue.PullRequest.Status 3}} {{ctx.Locale.Tr "repo.issues.comment_manually_pull_merged_at" (HTMLFormat `%[2]s` $link (ShortSha $.Issue.PullRequest.MergedCommitID)) (HTMLFormat "%[1]s" $.BaseTarget) $createdStr}} @@ -256,7 +256,7 @@ {{if not $timeStr}}{{$timeStr = .Content|Sec2Hour}}{{end}} {{ctx.Locale.Tr "repo.issues.stop_tracking_history" $timeStr $createdStr}} - {{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_delete_time" dict "comment" .}}
    {{else if eq .Type 14}}
    @@ -268,7 +268,7 @@ {{if not $timeStr}}{{$timeStr = .Content|Sec2Hour}}{{end}} {{ctx.Locale.Tr "repo.issues.add_time_history" $timeStr $createdStr}} - {{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_delete_time" dict "comment" .}}
    {{else if eq .Type 15}}
    @@ -380,7 +380,7 @@ {{- end -}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{if eq $reviewType 1}} {{ctx.Locale.Tr "repo.issues.review.approve" $createdStr}} {{else if eq $reviewType 3}} @@ -490,7 +490,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{ctx.Locale.Tr "repo.pulls.change_target_branch_at" .OldRef .NewRef $createdStr}}
    @@ -665,7 +665,7 @@
    {{svg "octicon-git-merge" 16}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{if eq .Type 34}}{{ctx.Locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr}} {{else}}{{ctx.Locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr}}{{end}} diff --git a/templates/repo/issue/view_content/comments_authorlink.tmpl b/templates/repo/issue/view_content/comments_authorlink.tmpl index fd07bd2b1c..8e0645c983 100644 --- a/templates/repo/issue/view_content/comments_authorlink.tmpl +++ b/templates/repo/issue/view_content/comments_authorlink.tmpl @@ -1,10 +1,10 @@ {{if .comment.OriginalAuthor}} - {{svg (MigrationIcon .ctxData.Repository.GetOriginalURLHostname)}} + {{svg (MigrationIcon ctx.RootData.Repository.GetOriginalURLHostname)}} {{.comment.OriginalAuthor}} - {{if .ctxData.Repository.OriginalURL}} - ({{ctx.Locale.Tr "repo.migrated_from" .ctxData.Repository.OriginalURL .ctxData.Repository.GetOriginalURLHostname}}) + {{if ctx.RootData.Repository.OriginalURL}} + ({{ctx.Locale.Tr "repo.migrated_from" ctx.RootData.Repository.OriginalURL ctx.RootData.Repository.GetOriginalURLHostname}}) {{end}} {{else}} {{template "shared/user/authorlink" .comment.Poster}} diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl index 219d5fc203..dfbbd5fd7a 100644 --- a/templates/repo/issue/view_content/comments_delete_time.tmpl +++ b/templates/repo/issue/view_content/comments_delete_time.tmpl @@ -1,9 +1,9 @@ -{{if and .comment.Time (.ctxData.Repository.IsTimetrackerEnabled ctx)}} {{/* compatibility with time comments made before v1.14 */}} +{{if and .comment.Time (ctx.RootData.Repository.IsTimetrackerEnabled ctx)}} {{/* compatibility with time comments made before v1.14 */}} {{if (not .comment.Time.Deleted)}} - {{if (or .ctxData.IsAdmin (and .ctxData.IsSigned (eq .ctxData.SignedUserID .comment.PosterID)))}} + {{if (or ctx.RootData.IsAdmin (and ctx.RootData.IsSigned (eq ctx.RootData.SignedUserID .comment.PosterID)))}} {{end}} {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}} - {{if IsMultilineCommitMessage .Message}} - 
    {{ctx.RenderUtils.RenderCommitBody .Message $.Repository}}
    + {{if $commit.MessageBody}} + 
    {{ctx.RenderUtils.RenderCommitBody $commit.MessageUTF8 $.Repository}}
    {{end}} {{if $.CommitsTagsMap}} {{range (index $.CommitsTagsMap .ID.String)}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 0470d1e9f5..c5f0d5b590 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -1,6 +1,6 @@ {{$index := 0}}
    -{{range .comment.Commits}} +{{range $commit := .comment.Commits}} {{$tag := printf "%s-%d" $.comment.HashTag $index}} {{$index = Eval $index "+" 1}}
    {{/*singular-commit*/}} @@ -14,11 +14,11 @@ {{$commitBaseLink := printf "%s/commit" $.comment.Issue.PullRequest.BaseRepo.Link}} {{$commitLink:= printf "%s/%s" $commitBaseLink (PathEscape .ID.String)}} - - {{- ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink $.comment.Issue.PullRequest.BaseRepo -}} + + {{- ctx.RenderUtils.RenderCommitMessageLinkSubject $commit.MessageUTF8 $commitLink $.comment.Issue.PullRequest.BaseRepo -}} - {{if IsMultilineCommitMessage .Message}} + {{if $commit.MessageBody}} {{end}} @@ -27,9 +27,9 @@ {{template "repo/commit_sign_badge" dict "Commit" . "CommitBaseLink" $commitBaseLink "CommitSignVerification" .Verification}}
    - {{if IsMultilineCommitMessage .Message}} + {{if $commit.MessageBody}} 
    -		{{- ctx.RenderUtils.RenderCommitBody .Message $.comment.Issue.PullRequest.BaseRepo -}}
+		{{- ctx.RenderUtils.RenderCommitBody $commit.MessageUTF8 $.comment.Issue.PullRequest.BaseRepo -}}
    {{end}} {{end}} diff --git a/templates/repo/latest_commit.tmpl b/templates/repo/latest_commit.tmpl index c8f1ad5492..c0518189b8 100644 --- a/templates/repo/latest_commit.tmpl +++ b/templates/repo/latest_commit.tmpl @@ -17,10 +17,11 @@ {{template "repo/commit_statuses" dict "Status" .LatestCommitStatus "Statuses" .LatestCommitStatuses}} {{$commitLink:= printf "%s/commit/%s" .RepoLink (PathEscape .LatestCommit.ID.String)}} - {{ctx.RenderUtils.RenderCommitMessageLinkSubject .LatestCommit.Message $commitLink $.Repository}} - {{if IsMultilineCommitMessage .LatestCommit.Message}} + + {{ctx.RenderUtils.RenderCommitMessageLinkSubject .LatestCommit.MessageUTF8 $commitLink $.Repository}} + {{if .LatestCommit.MessageBody}} - 
    {{ctx.RenderUtils.RenderCommitBody .LatestCommit.Message $.Repository}}
    + 
    {{ctx.RenderUtils.RenderCommitBody .LatestCommit.MessageUTF8 $.Repository}}
    {{end}}     {{end}} diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl index 1e89b5012e..ddf98783db 100644 --- a/templates/repo/settings/lfs_file_find.tmpl +++ b/templates/repo/settings/lfs_file_find.tmpl @@ -6,7 +6,7 @@

    - {{range .Results}} + {{range $lfsItem := .Results}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 317c67611e..e79eac1dd1 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -56,7 +56,7 @@
    {{if $commit}} {{$commitLink := printf "%s/commit/%s" $.RepoLink (PathEscape $commit.ID.String)}} - {{ctx.RenderUtils.RenderCommitMessageLinkSubject $commit.Message $commitLink $.Repository}} + {{ctx.RenderUtils.RenderCommitMessageLinkSubject $commit.MessageUTF8 $commitLink $.Repository}} {{else}} … {{/* will be loaded again by LastCommitLoaderURL */}} {{end}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 03f03b176d..baf077863c 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -88,13 +88,13 @@ {{$repoLink := (.GetRepoLink ctx)}} {{$repo := .Repo}}
    - {{range $push.Commits}} + {{range $pushCommit := $push.Commits}} {{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
    {{ShortSha .Sha1}} - {{ctx.RenderUtils.RenderCommitMessage .Message $repo}} + {{ctx.RenderUtils.RenderCommitMessage $pushCommit.Message $repo}}
    {{end}} diff --git a/tests/integration/api_repo_tags_test.go b/tests/integration/api_repo_tags_test.go index 03dafafb2d..13718040ce 100644 --- a/tests/integration/api_repo_tags_test.go +++ b/tests/integration/api_repo_tags_test.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestAPIRepoTags(t *testing.T) { @@ -35,24 +36,22 @@ func TestAPIRepoTags(t *testing.T) { assert.Len(t, tags, 1) assert.Equal(t, "v1.1", tags[0].Name) - assert.Equal(t, "Initial commit", tags[0].Message) + assert.Equal(t, "Initial commit\n", tags[0].Message) assert.Equal(t, "65f1bf27bc3bf70f64657658635e66094edbcb4d", tags[0].Commit.SHA) assert.Equal(t, setting.AppURL+"api/v1/repos/user2/repo1/git/commits/65f1bf27bc3bf70f64657658635e66094edbcb4d", tags[0].Commit.URL) assert.Equal(t, setting.AppURL+"user2/repo1/archive/v1.1.zip", tags[0].ZipballURL) assert.Equal(t, setting.AppURL+"user2/repo1/archive/v1.1.tar.gz", tags[0].TarballURL) newTag := createNewTagUsingAPI(t, token, user.Name, repoName, "gitea/22", "", "nice!\nand some text") + assert.Equal(t, "nice!\nand some text\n", newTag.Message) // git message standard: there will always be a newline at the end of the message + resp = MakeRequest(t, req, http.StatusOK) tags = DecodeJSON(t, resp, []*api.Tag{}) - assert.Len(t, tags, 2) - for _, tag := range tags { - if tag.Name != "v1.1" { - assert.Equal(t, newTag.Name, tag.Name) - assert.Equal(t, newTag.Message, tag.Message) - assert.Equal(t, "nice!\nand some text", tag.Message) - assert.Equal(t, newTag.Commit.SHA, tag.Commit.SHA) - } - } + require.Len(t, tags, 2) + respTag := tags[0] + assert.Equal(t, newTag.Name, respTag.Name) + assert.Equal(t, newTag.Message, respTag.Message) + assert.Equal(t, newTag.Commit.SHA, respTag.Commit.SHA) // get created tag req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/tags/%s", user.Name, repoName, newTag.Name). From 3e69d6adbe21764d43e197fdabd10cbc3964f396 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 7 May 2026 19:12:52 +0200 Subject: [PATCH 19/20] refactor: remove obsolete export (#37579) Leftover from https://github.com/go-gitea/gitea/commit/2644bb8490e7d6e3be5c4548b02c76eacd196569, not needed because module no longer does top-level-await. Co-authored-by: Nicolas --- web_src/js/vitest.setup.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/web_src/js/vitest.setup.ts b/web_src/js/vitest.setup.ts index 190196cabd..a6ec019ff8 100644 --- a/web_src/js/vitest.setup.ts +++ b/web_src/js/vitest.setup.ts @@ -16,5 +16,3 @@ window.config = { }; window.testModules = {}; - -export {}; // mark as module for top-level await From e9f82b0ee316556032bb0092ad0b4bc2a000cf1a Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 7 May 2026 19:18:10 +0200 Subject: [PATCH 20/20] ci: allow `chore` type in PR title lint (#37575) Follow-up to #37498, adds `chore` to the allowed PR title types so the set matches the standard [`@commitlint/config-conventional`](https://github.com/conventional-changelog/commitlint/tree/868983c18efcb6fa835197cc9b2275545e528ad4/%40commitlint/config-conventional#type-enum). --- This PR was written with the help of Claude Opus 4.7 --------- Signed-off-by: silverwind Co-authored-by: Claude (Opus 4.7) --- CONTRIBUTING.md | 2 +- tools/lint-pr-title.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c62950d84b..27103a991b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -195,7 +195,7 @@ PR titles must follow the [Conventional Commits](https://www.conventionalcommits type(scope)!: subject ``` -The allowed types are `build`, `ci`, `docs`, `feat`, `fix`, `perf`, `refactor`, `revert`, `style`, and `test`. The generic `chore` type is intentionally not accepted; pick a more descriptive type instead. +The allowed types are `build`, `chore`, `ci`, `docs`, `feat`, `fix`, `perf`, `refactor`, `revert`, `style`, and `test`. The generic `chore` type is intentionally not accepted; pick a more descriptive type instead. Examples: diff --git a/tools/lint-pr-title.js b/tools/lint-pr-title.js index 2df340f186..7caeb78085 100644 --- a/tools/lint-pr-title.js +++ b/tools/lint-pr-title.js @@ -1,7 +1,7 @@ #!/usr/bin/env node import {env, exit} from 'node:process'; -const allowedTypes = 'build, ci, docs, feat, fix, perf, refactor, revert, style, test'; +const allowedTypes = 'build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test'; const title = env.PR_TITLE; if (!title) {
    {{svg "octicon-file"}} @@ -14,8 +14,8 @@ - - {{.Summary | ctx.RenderUtils.RenderEmoji}} + + {{$lfsItem.Summary | ctx.RenderUtils.RenderEmoji}}