ui bugfixes

a lot of frontend improvements, still not usable
Merge branch 'main' into integrated-email-server
2026-06-30 05:33:24 +00:00 · 2026-06-23 20:29:31 +03:00 · 2026-06-23 02:28:32 +03:00 · 2026-06-21 13:35:32 +00:00 · 2026-06-21 16:35:11 +03:00 · 2026-06-18 20:47:52 +00:00
397 changed files with 10245 additions and 10796 deletions
@@ -13,7 +13,7 @@ runs:
  using: composite
  steps:
    - uses: ./.github/actions/free-disk-space
-    - uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
+    - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
      with:
        go-version-file: go.mod
        check-latest: true
@@ -9,7 +9,7 @@ inputs:
 runs:
  using: composite
  steps:
-    - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+    - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
    - if: ${{ inputs.cache == 'true' }}
      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
      with:
@@ -29,7 +29,7 @@ jobs:
  gobuild:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - run: make deps-backend deps-tools
      - run: TAGS="bindata" make backend
@@ -59,7 +59,7 @@ jobs:
        include:
          - { tags: "bindata", target: "lint-backend" }
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
        with:
          lint-cache: "true"
@@ -12,8 +12,8 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-      - uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
        with:
          go-version-file: go.mod
          check-latest: true
@@ -20,8 +20,8 @@ jobs:
    if: github.repository == 'go-gitea/gitea' # prevent running on forks
    timeout-minutes: 30
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-      - uses: renovatebot/github-action@6d859fc95779be83a0335ca704879b47e5d79641 # v46.1.16
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: renovatebot/github-action@8217b3fc286df088d7c27f3255fe8414463bc0fd # v46.1.15
        with:
          renovate-version: ${{ env.RENOVATE_VERSION }}
          configurationFile: renovate.json5
@@ -12,8 +12,8 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-      - uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2.16.3
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
        with:
          upload_sources: true
          upload_translations: false
@@ -49,7 +49,7 @@ jobs:
      e2e: ${{ steps.changes.outputs.e2e }}
      shell: ${{ steps.changes.outputs.shell }}
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
        id: changes
        with:
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 30
    steps:
-      - uses: go-gitea/giteabot@912675d47455ac93be82d8bda4667a02b20a6fe4 # v1.0.4
+      - uses: go-gitea/giteabot@f8a6f4c14d46920b4b5448852be3de72d00066f0 # v1.0.3
        with:
          github_token: ${{ secrets.GITEABOT_TOKEN }}
          gitea_fork: giteabot/gitea
@@ -58,7 +58,7 @@ jobs:
    steps:
      # pull_request_review runs without repository secrets on fork PRs, so fall
      # back to the workflow token for the non-backport checks handled here.
-      - uses: go-gitea/giteabot@912675d47455ac93be82d8bda4667a02b20a6fe4 # v1.0.4
+      - uses: go-gitea/giteabot@f8a6f4c14d46920b4b5448852be3de72d00066f0 # v1.0.3
        with:
          github_token: ${{ secrets.GITEABOT_TOKEN || github.token }}
          checks: ${{ github.event.inputs.checks || 'labels,merge_queue,lock,feedback,last_call,milestones,lgtm,translation_comment,pr_actions' }}
@@ -19,7 +19,7 @@ jobs:
    needs: files-changed
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
        with:
          lint-cache: "true"
@@ -31,7 +31,7 @@ jobs:
    needs: files-changed
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
        with:
          cache: "false"
@@ -62,7 +62,7 @@ jobs:
    needs: files-changed
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - run: make deps-backend deps-tools
      - run: make --always-make checks-backend # ensure the "go-licenses" make target runs
@@ -72,7 +72,7 @@ jobs:
    needs: files-changed
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/node-setup
      - run: make deps-frontend
      - run: make lint-frontend
@@ -85,7 +85,7 @@ jobs:
    needs: files-changed
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - run: make deps-backend generate-go
      # no frontend build here as backend should be able to build, even without any frontend files
@@ -42,7 +42,7 @@ jobs:
        ports:
          - "9000:9000"
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - uses: ./.github/actions/pgsql-shard
        with:
@@ -78,7 +78,7 @@ jobs:
        ports:
          - "9000:9000"
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - uses: ./.github/actions/pgsql-shard
        with:
@@ -90,7 +90,7 @@ jobs:
    needs: files-changed
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - run: make deps-backend
      - run: make backend
@@ -131,7 +131,7 @@ jobs:
        ports:
          - "7700:7700"
      redis:
-        image: redis:latest@sha256:c904002d182255b6db3cbe3a1e8ce6c187d15390c39500b59fc07181aabff7bf
+        image: redis:latest@sha256:a505f8b9d8ac3ff7b0848055b4abf1901d6d77606774aa1e38bd37f1197ed2b5
        options: >- # wait until redis has started
          --health-cmd "redis-cli ping"
          --health-interval 5s
@@ -151,7 +151,7 @@ jobs:
        ports:
          - 10000:10000
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - name: Add hosts to /etc/hosts
        run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 minio devstoreaccount1.azurite.local mysql elasticsearch meilisearch smtpimap" | sudo tee -a /etc/hosts'
@@ -208,7 +208,7 @@ jobs:
          - "587:587"
          - "993:993"
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - name: Add hosts to /etc/hosts
        run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql elasticsearch smtpimap" | sudo tee -a /etc/hosts'
@@ -241,7 +241,7 @@ jobs:
        ports:
          - 10000:10000
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - name: Add hosts to /etc/hosts
        run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql devstoreaccount1.azurite.local" | sudo tee -a /etc/hosts'
@@ -21,7 +21,7 @@ jobs:
    needs: [files-changed]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/docker-dryrun
        with:
          platform: linux/amd64
@@ -31,7 +31,7 @@ jobs:
    needs: [files-changed]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/docker-dryrun
        with:
          platform: linux/arm64
@@ -41,7 +41,7 @@ jobs:
    needs: [files-changed]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/docker-dryrun
        with:
          platform: linux/riscv64
@@ -19,7 +19,7 @@ jobs:
    needs: files-changed
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      - uses: ./.github/actions/go-setup
      - uses: ./.github/actions/node-setup
      - run: make deps-frontend
@@ -30,7 +30,7 @@ jobs:
      pull-requests: write
    steps:
      # Base-branch checkout only: pull_request_target runs with elevated token; never run PR-head code here.
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: ${{ github.event.pull_request.base.sha }}
      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -17,15 +17,11 @@ jobs:
      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}

    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

      - name: Install snapcraft
        run: sudo snap install snapcraft --classic

-      - name: Authenticate snapcraft
-        shell: bash
-        run: snapcraft login --with <(printf '%s' "$SNAPCRAFT_STORE_CREDENTIALS")
-
      - name: Remote build
        run: |
          snapcraft remote-build \
@@ -13,17 +13,16 @@ jobs:
    runs-on: namespace-profile-gitea-release-binary
    permissions:
      contents: read
-      id-token: write
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
      - run: git fetch --unshallow --quiet --tags --force
-      - uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
        with:
          go-version-file: go.mod
          check-latest: true
-      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+      - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version: 24
@@ -34,8 +33,6 @@ jobs:
      - run: make release
        env:
          TAGS: bindata
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
      - name: import gpg key
        id: import_gpg
        uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0
@@ -48,7 +45,6 @@ jobs:
          GPG_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }}
        run: |
          for f in dist/release/*; do
-            cosign sign-blob "$f" --bundle "$f.sigstore.json" --yes
            echo "$GPG_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --batch --yes --detach-sign -u "$GPG_FINGERPRINT" --output "$f.asc" "$f"
          done
      # clean branch name to get the folder name in S3
@@ -79,7 +75,7 @@ jobs:
      contents: read
      packages: write # to publish to ghcr.io
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
      - run: git fetch --unshallow --quiet --tags --force
@@ -14,17 +14,16 @@ jobs:
    runs-on: namespace-profile-gitea-release-binary
    permissions:
      contents: read
-      id-token: write
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
      - run: git fetch --unshallow --quiet --tags --force
-      - uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
        with:
          go-version-file: go.mod
          check-latest: true
-      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+      - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version: 24
@@ -35,8 +34,6 @@ jobs:
      - run: make release
        env:
          TAGS: bindata
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
      - name: import gpg key
        id: import_gpg
        uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0
@@ -49,7 +46,6 @@ jobs:
          GPG_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }}
        run: |
          for f in dist/release/*; do
-            cosign sign-blob "$f" --bundle "$f.sigstore.json" --yes
            echo "$GPG_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --batch --yes --detach-sign -u "$GPG_FINGERPRINT" --output "$f.asc" "$f"
          done
      # clean branch name to get the folder name in S3
@@ -90,7 +86,7 @@ jobs:
      contents: read
      packages: write # to publish to ghcr.io
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
      - run: git fetch --unshallow --quiet --tags --force
@@ -17,17 +17,16 @@ jobs:
    permissions:
      contents: read
      packages: write # to publish to ghcr.io
-      id-token: write
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
      - run: git fetch --unshallow --quiet --tags --force
-      - uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
        with:
          go-version-file: go.mod
          check-latest: true
-      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+      - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version: 24
@@ -38,8 +37,6 @@ jobs:
      - run: make release
        env:
          TAGS: bindata
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
      - name: import gpg key
        id: import_gpg
        uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0
@@ -52,7 +49,6 @@ jobs:
          GPG_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }}
        run: |
          for f in dist/release/*; do
-            cosign sign-blob "$f" --bundle "$f.sigstore.json" --yes
            echo "$GPG_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --batch --yes --detach-sign -u "$GPG_FINGERPRINT" --output "$f.asc" "$f"
          done
      # clean branch name to get the folder name in S3
@@ -93,7 +89,7 @@ jobs:
      contents: read
      packages: write # to publish to ghcr.io
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
      - run: git fetch --unshallow --quiet --tags --force
@@ -107,7 +107,6 @@ linters:
        - -QF1008
    testifylint:
      disable:
-        - empty
        - go-require
        - require-error
    usetesting:
@@ -4,56 +4,6 @@ This changelog goes through the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.com).

-## [1.26.4](https://github.com/go-gitea/gitea/releases/tag/1.26.4) - 2026-06-21
-
-* SECURITY
-  * fix(auth): do not auto-reactivate disabled users on OAuth2 callback (#38009) (#38183)
-
-* BUGFIXES
-  * fix: walk git log context error handling (#38182) (#38185)
-
-## [1.26.3](https://github.com/go-gitea/gitea/releases/tag/1.26.3) - 2026-06-18
-
-* BREAKING
-  * fix(actions)!: require merged PR to bypass fork PR approval gate (#38010) (#38041)
-
-* SECURITY
-  * fix(hostmatcher): patch incorrect private list (#38170) (#38173)
-  * fix: Various security fixes (#38103) (#38151)
-  * fix: Various sec fixes (#38108) (#38147)
-  * fix: allow git clone of private repos with anonymous code access (#38074) (#38146)
-  * fix(auth): ignore stale OIDC external login links to organizations (#37875) (#38141)
-  * fix(hostmatcher): block reserved IP ranges from external/private filters (#38039) (#38059)
-  * fix(lfs): require Code-unit access for cross-repo LFS object reuse (#38006) (#38050)
-  * fix(lfs): reject unknown SSH LFS sub-verbs to prevent auth bypass (#38008) (#38015)
-  * fix: bound CODEOWNERS regex match time (#38011) (#38025)
-  * fix: bound debian ParseControlFile to a single control stanza (#38044) (#38055)
-  * fix(deps): update module golang.org/x/net to v0.55.0 [security] (#37813) (#37829)
-
-* API
-  * feat(api): add Link header in ListForks (#38052) (#38063)
-
-* BUGFIXES
-  * fix: Fix the panic when ssh remote lfs endpoint parsing failure (#38026) (#38158)
-  * fix(api): nil pointer panic when filtering tracked times by a non-existent user (#38112) (#38115)
-  * fix: keep literal "false" value displayed in workflow_dispatch choice dropdowns (#38080) (#38096)
-  * fix: parse HEAD ref (#38119)
-  * fix: git cmd (#38084) (#38087)
-  * fix(releases): generate notes for initial tag (#37697) (#37986)
-  * fix(actions): return 404 when job log blob is missing (#38003) (#38004)
-  * fix(actions): exclude `workflow_call` from workflow trigger detection (#37894) (#37899)
-  * fix(actions): keep action run title clickable when commit subject is a URL (#37867) (#37898)
-  * fix(actions): reject workflow_dispatch for workflows without that trigger (#37660) (#37895)
-  * fix(actions): ack re-sent `UpdateLog` finalize idempotently (#37885) (#37892)
-  * fix: http content file render (#37850) (#37856)
-  * fix(issues): clear stale ReviewTypeRequest when submitting pending review (#37809) (#37815)
-  * fix: Fix issue target branch selection for non-collaborators (#36916) (#38164)
-
-* BUILD
-  * fix(deps): update `@playwright/test` to 1.60.0 (#38144)
-  * ci: add `tools/ci-tools.ts` for the PR labeler workflow (#37831)
-  * fix(build): swagger css import (#37801) (#37803)
-
 ## [1.26.2](https://github.com/go-gitea/gitea/releases/tag/1.26.2) - 2026-05-20

 * SECURITY
@@ -1,20 +1,232 @@
-Copyright (c) 2016 The Gitea Authors
-Copyright (c) 2015 The Gogs Authors
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>

-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and other kinds of works.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS
+
+0. Definitions.
+
+“This License” refers to version 3 of the GNU General Public License.
+
+“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based on the Program.
+
+To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
+
+A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+2. Basic Permissions.
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+
+4. Conveying Verbatim Copies.
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+     a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+
+     b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
+
+     c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+
+     d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+     a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+
+     b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+
+     c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+
+     d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+
+     e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+
+7. Additional Terms.
+“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+     a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+
+     b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+
+     c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+
+     d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+
+     e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+
+     f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+
+8. Termination.
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+
+11. Patents.
+A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
+
+A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+
+14. Revised Versions of this License.
+The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+
+15. Disclaimer of Warranty.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found.
+
+     vphash
+     Copyright (C) 2026  d
+
+     This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
+
+     vphash  Copyright (C) 2026  d
+     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+     This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”.
+
+You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <https://www.gnu.org/philosophy/why-not-lgpl.html>.
@@ -18,7 +18,7 @@ GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.15 # renovate: datasource=go
 MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.8.0 # renovate: datasource=go
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.34.1 # renovate: datasource=go
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@v1.9.0 # renovate: datasource=go
-GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.4.0 # renovate: datasource=go
+GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.3.0 # renovate: datasource=go
 ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/actionlint@v1.7.12 # renovate: datasource=go
 SHELLCHECK_IMAGE ?= docker.io/koalaman/shellcheck:v0.11.0@sha256:61862eba1fcf09a484ebcc6feea46f1782532571a34ed51fedf90dd25f925a8d # renovate: datasource=docker

@@ -127,7 +127,6 @@ BINDATA_DEST_WILDCARD := modules/migration/bindata.* modules/public/bindata.* mo
 GENERATED_GO_DEST := modules/charset/invisible_gen.go modules/charset/ambiguous_gen.go

 SVG_DEST_DIR := public/assets/img/svg
-SVG_DEST_DIRS := $(SVG_DEST_DIR) options/fileicon

 AIR_TMP_DIR := .air

@@ -634,10 +633,10 @@ svg: node_modules ## build svg files

 .PHONY: svg-check
 svg-check: svg
-	@git add $(SVG_DEST_DIRS)
-	@diff=$$(git diff --color=always --cached $(SVG_DEST_DIRS)); \
+	@git add $(SVG_DEST_DIR)
+	@diff=$$(git diff --color=always --cached $(SVG_DEST_DIR)); \
 	if [ -n "$$diff" ]; then \
-		echo "Please run 'make svg' and 'git add $(SVG_DEST_DIRS)' and commit the result:"; \
+		echo "Please run 'make svg' and 'git add $(SVG_DEST_DIR)' and commit the result:"; \
 		printf "%s" "$${diff}"; \
 		exit 1; \
 	fi
@@ -1,199 +1,58 @@
-# Gitea
-
-[![](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main)](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain "Release Nightly")
-[![](https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2)](https://discord.gg/Gitea "Join the Discord chat at https://discord.gg/Gitea")
-[![](https://goreportcard.com/badge/gitea.dev)](https://goreportcard.com/report/gitea.dev "Go Report Card")
-[![](https://pkg.go.dev/badge/gitea.dev?status.svg)](https://pkg.go.dev/gitea.dev "GoDoc")
-[![](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest "GitHub release")
-[![](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea "Help Contribute to Open Source")
-[![](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea "Become a backer/sponsor of gitea")
-[![](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT "License: MIT")
-[![](https://badges.crowdin.net/gitea/localized.svg)](https://translate.gitea.com "Crowdin")
-
-[繁體中文](./README.zh-tw.md) | [简体中文](./README.zh-cn.md)
-
-## Purpose
-
-The goal of Gitea is to make the easiest, fastest, and most painless way of
-setting up a self-hosted all-in-one software development service,
-including Git hosting, code management, code review, issue tracking, project kanban, wiki,
-team collaboration, package registry and CI/CD which can reuse GitHub Actions.
-
-As Gitea is written in Go, it works across **all** the platforms and
-architectures that are supported by Go, including Linux, macOS, FreeBSD/OpenBSD and Windows
-on x86, amd64, ARM, RISC-V 64 and PowerPC architectures.
-
-For online demonstrations, you can visit [demo.gitea.com](https://demo.gitea.com).
-
-For accessing free Gitea service (with a limited number of repositories), you can visit [gitea.com](https://gitea.com/user/login).
-
-To quickly deploy your own dedicated Gitea instance on Gitea Cloud, you can start a free trial at [cloud.gitea.com](https://cloud.gitea.com),
-or use container (docker/podman/etc) to deploy on your own server with the [official image](https://hub.docker.com/r/gitea/gitea).
-
-## Documentation
-
-You can find comprehensive documentation on our official [documentation website](https://docs.gitea.com/).
-
-It includes installation, administration, usage, development, contributing guides, and more to help you get started and explore all features effectively.
-
-If you have any suggestions or would like to contribute to it, you can visit the [documentation repository](https://gitea.com/gitea/docs)
-
-## Building
-
-See [docs/build-setup.md](docs/build-setup.md) for prerequisites
-and [docs/development.md](docs/development.md) for setting up a local development environment, linting, and testing.
-
-If you'd like to build from source or make a distribution package, see [docs/build-source.md](docs/build-source.md) for more information.
-
-After building, you can run `./gitea web` to start the server, or `./gitea help` to see all available commands.
-
-## Contributing
-
-Expected workflow is: Fork -> Patch -> Push -> Pull Request
-
-> [!NOTE]
->
-> 1. **YOU MUST READ THE [CONTRIBUTORS GUIDE](CONTRIBUTING.md) BEFORE STARTING TO WORK ON A PULL REQUEST.**
-> 2. New to the codebase? The [development guide](docs/development.md) walks through setting up a local environment and building from source.
-> 3. If you have found a vulnerability in the project, please write privately to **security@gitea.io**. Thanks!
-
-## Translating
-
-[![Crowdin](https://badges.crowdin.net/gitea/localized.svg)](https://translate.gitea.com)
-
-Translations are done through [Crowdin](https://translate.gitea.com). If you want to translate to a new language, ask one of the managers in the Crowdin project to add a new language there.
-
-You can also just create an issue for adding a language or ask on Discord on the #translation channel. If you need context or find some translation issues, you can leave a comment on the string or ask on Discord. For general translation questions there is a section in the docs. Currently a bit empty, but we hope to fill it as questions pop up.
-
-Get more information from [documentation](https://docs.gitea.com/contributing/localization).
-
-## Official and Third-Party Projects
-
-We provide an official [go-sdk](https://gitea.com/gitea/go-sdk), a CLI tool called [tea](https://gitea.com/gitea/tea) and an [action runner](https://gitea.com/gitea/act_runner) for Gitea Action.
-
-We maintain a list of Gitea-related projects at [gitea/awesome-gitea](https://gitea.com/gitea/awesome-gitea), where you can discover more third-party projects, including SDKs, plugins, themes, and more.
-
-## Communication
-
-[![](https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2)](https://discord.gg/Gitea "Join the Discord chat at https://discord.gg/Gitea")
-
-If you have questions that are not covered by the [documentation](https://docs.gitea.com/), you can get in contact with us on our [Discord server](https://discord.gg/Gitea) or create a post in the [discourse forum](https://forum.gitea.com/).
-
-## Authors
-
- [Maintainers](https://github.com/orgs/go-gitea/people)
- [Contributors](https://github.com/go-gitea/gitea/graphs/contributors)
- [Translators](options/locale/TRANSLATORS)
-
-## Backers
-
-Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/gitea#backer)]
-
-<a href="https://opencollective.com/gitea#backers" target="_blank"><img src="https://opencollective.com/gitea/backers.svg?width=890"></a>
-
-## Sponsors
-
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/gitea#sponsor)]
-
-<a href="https://opencollective.com/gitea/sponsor/0/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/1/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/2/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/3/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/4/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/5/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/6/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/7/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/8/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/gitea/sponsor/9/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/9/avatar.svg"></a>
-
-## FAQ
-
-**How do you pronounce Gitea?**
-
-Gitea is pronounced [/ɡɪ’ti:/](https://youtu.be/EM71-2uDAoY) as in "gi-tea" with a hard g.
-
-**How do I configure Gitea?**
-
-For dynamic config options, you can change it on your admin panel's configuration section.
-
-For static config options, you can edit your `app.ini` file and resart the instance.
-See [app.example.ini](https://github.com/go-gitea/gitea/blob/main/custom/conf/app.example.ini) or [configuration documentation](https://docs.gitea.com/administration/config-cheat-sheet) for more details.
-
-**Where can I find the security patches?**
-
-In the [release log](https://github.com/go-gitea/gitea/releases) or the [change log](https://github.com/go-gitea/gitea/blob/main/CHANGELOG.md), search for the keyword `SECURITY` to find the security patches.
-
-(more FAQs are listed in [FAQ documentation](https://docs.gitea.com/help/faq))
-
-## License
-
-This project is licensed under the MIT License.
-See the [LICENSE](https://github.com/go-gitea/gitea/blob/main/LICENSE) file
-for the full license text.
-
-## Further information
-
-<details>
-<summary>Looking for an overview of the interface? Check it out the screenshots!</summary>
-
-### Login/Register Page
-
-![Login](https://dl.gitea.com/screenshots/login.png)
-![Register](https://dl.gitea.com/screenshots/register.png)
-
-### User Dashboard
-
-![Home](https://dl.gitea.com/screenshots/home.png)
-![Issues](https://dl.gitea.com/screenshots/issues.png)
-![Pull Requests](https://dl.gitea.com/screenshots/pull_requests.png)
-![Milestones](https://dl.gitea.com/screenshots/milestones.png)
-
-### User Profile
-
-![Profile](https://dl.gitea.com/screenshots/user_profile.png)
-
-### Explore
-
-![Repos](https://dl.gitea.com/screenshots/explore_repos.png)
-![Users](https://dl.gitea.com/screenshots/explore_users.png)
-![Orgs](https://dl.gitea.com/screenshots/explore_orgs.png)
-
-### Repository
-
-![Home](https://dl.gitea.com/screenshots/repo_home.png)
-![Commits](https://dl.gitea.com/screenshots/repo_commits.png)
-![Branches](https://dl.gitea.com/screenshots/repo_branches.png)
-![Labels](https://dl.gitea.com/screenshots/repo_labels.png)
-![Milestones](https://dl.gitea.com/screenshots/repo_milestones.png)
-![Releases](https://dl.gitea.com/screenshots/repo_releases.png)
-![Tags](https://dl.gitea.com/screenshots/repo_tags.png)
-
-#### Repository Issue
-
-![List](https://dl.gitea.com/screenshots/repo_issues.png)
-![Issue](https://dl.gitea.com/screenshots/repo_issue.png)
-
-#### Repository Pull Requests
-
-![List](https://dl.gitea.com/screenshots/repo_pull_requests.png)
-![Pull Request](https://dl.gitea.com/screenshots/repo_pull_request.png)
-![File](https://dl.gitea.com/screenshots/repo_pull_request_file.png)
-![Commits](https://dl.gitea.com/screenshots/repo_pull_request_commits.png)
-
-#### Repository Actions
-
-![List](https://dl.gitea.com/screenshots/repo_actions.png)
-![Details](https://dl.gitea.com/screenshots/repo_actions_run.png)
-
-#### Repository Activity
-
-![Activity](https://dl.gitea.com/screenshots/repo_activity.png)
-![Contributors](https://dl.gitea.com/screenshots/repo_contributors.png)
-![Code Frequency](https://dl.gitea.com/screenshots/repo_code_frequency.png)
-![Recent Commits](https://dl.gitea.com/screenshots/repo_recent_commits.png)
-
-### Organization
-
-![Home](https://dl.gitea.com/screenshots/org_home.png)
-
-</details>
+# M8SH - decentralized swiss knife
+
+Project is under development.
+
+Roadmap:
+
+- decentralized GPG-based registration, authorization and authentication (further when clients are developed - GPG would be integrated into client and invoked via secure bridge for fully password-less and input-less flow, preseving security level of GPG) (usage of external email domain assumes it's an external user and decetralized features will be disabled)
+- integrated email server (ui, rest)
+- integrated messenger (ui, rest)
+- integrated search engine (seach over external gitea instances repositories, specific tags for repos to be indexed, view external things from home instance)
+- integrated posts, articles
+- integrated videos, reels
+- integrated music player
+- integrated VPN (amnesia)
+
+---
+
+### Licensing
+
+Project is published under GPLv3 license. If you modify GPLv3 code and distribute the resulting software, your entire application must also be licensed under GPLv3.
+
+<!-- 
+- integrated cloud storage
+- integrated calls
+- integrated video-conferences
+- integrated stickers
+- integrated NFT assets, crypto-wallets
+
+TRANSLATIONS:
+    cs-CZ
+    de-DE
+    el-GR
+    en-US
+    es-ES
+    fa-IR
+    fi-FI
+    fr-FR
+    ga-IE
+    hu-HU
+    id-ID
+    is-IS
+    it-IT
+    ja-JP
+    ko-KR
+    lv-LV
+    nl-NL
+    pl-PL
+    pt-BR
+    pt-PT
+    ru-RU
+    si-LK
+    sk-SK
+    sv-SE
+    tr-TR
+    uk-UA
+    zh-CN
+    zh-TW
+-->
@@ -158,8 +158,7 @@ func runCreateUser(ctx context.Context, c *cli.Command) error {
 	}

 	isAdmin := c.Bool("admin")
-	// Only local, existing, regular users should be forced to update their password. Bot users for example are non-interactive
-	mustChangePassword := userType == user_model.UserTypeIndividual
+	mustChangePassword := true // always default to true
 	if c.IsSet("must-change-password") {
 		if userType != user_model.UserTypeIndividual {
 			return errors.New("must-change-password flag can only be set for individual users")
@@ -63,7 +63,6 @@ func TestAdminUserCreate(t *testing.T) {
 		u := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: "u"})
 		assert.Equal(t, user_model.UserTypeBot, u.Type)
 		assert.Empty(t, u.Passwd)
-		assert.False(t, u.MustChangePassword, "bot users should not be forced to change password")
 	})

 	t.Run("AccessToken", func(t *testing.T) {
@@ -203,7 +203,7 @@ func TestCliCmdError(t *testing.T) {
 	assert.Error(t, err)
 	assert.Equal(t, 1, r.ExitCode)
 	assert.Empty(t, r.Stdout)
-	assert.Equal(t, "Incorrect Usage: flag provided but not defined: -no-such\n", r.Stderr)
+	assert.Equal(t, "Incorrect Usage: flag provided but not defined: -no-such\n\n", r.Stderr)

 	app = newTestApp(cli.Command{Action: func(ctx context.Context, cmd *cli.Command) error { return nil }})
 	r, err = runTestApp(app, "./gitea", "test-cmd")
@@ -235,14 +235,3 @@ func TestCliCmdBefore(t *testing.T) {
 	assert.Equal(t, "/tmp/any.ini", configValues["before"], "BeforeFunc must be called before preparing config")
 	assert.Equal(t, "/dev/null", configValues["action"])
 }
-
-func TestCliCmdCompletion(t *testing.T) {
-	app := newTestApp(cli.Command{
-		Action: func(ctx context.Context, cmd *cli.Command) error { return nil },
-	})
-	res, err := runTestApp(app, "./gitea", "completion", "bash", "--nonexist")
-	assert.Error(t, err)
-	assert.Equal(t, 1, res.ExitCode)
-	assert.Equal(t, "", res.Stdout)
-	assert.Equal(t, "Incorrect Usage: flag provided but not defined: -nonexist\n", res.Stderr)
-}
@@ -5,10 +5,10 @@ package cmd

 import (
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"os"
+	"strings"

 	"gitea.dev/modules/log"
 	"gitea.dev/modules/setting"
@@ -154,37 +154,16 @@ func NewMainApp(appVer AppVersion) *cli.Command {
 	return app
 }

-// usageErr marks a usage error already reported by cliOnUsageError, so RunMainApp does not print it again.
-type usageErr struct{ err error }
-
-func (e usageErr) Error() string { return e.err.Error() }
-func (e usageErr) Unwrap() error { return e.err }
-
-// cliOnUsageError reports usage errors itself instead of letting urfave/cli dump the full help to stdout (since urfave/cli v3.10).
-func cliOnUsageError(_ context.Context, cmd *cli.Command, err error, _ bool) error {
-	_, _ = fmt.Fprintf(cmd.Root().ErrWriter, "Incorrect Usage: %s\n", err.Error())
-	return usageErr{err}
-}
-
-func setCLIOnUsageError(cmd *cli.Command) {
-	_ = cmd.Walk(func(c *cli.Command) error {
-		c.OnUsageError = cliOnUsageError
-		return nil
-	})
-}
-
 func RunMainApp(app *cli.Command, args ...string) error {
 	ctx, cancel := installSignals()
 	defer cancel()
-	setCLIOnUsageError(app)
-	// the completion subcommands are built during app.Run, after the Walk above, so cover them via this hook
-	app.ConfigureShellCompletionCommand = setCLIOnUsageError
 	err := app.Run(ctx, args)
 	if err == nil {
 		return nil
 	}
-	if _, ok := errors.AsType[usageErr](err); ok {
-		cli.OsExiter(1) // cliOnUsageError already reported it
+	if strings.HasPrefix(err.Error(), "flag provided but not defined:") {
+		// the cli package should already have output the error message, so just exit
+		cli.OsExiter(1)
 		return err
 	}
 	_, _ = fmt.Fprintf(app.ErrWriter, "Command error: %v\n", err)
@@ -26,6 +26,7 @@ import (
 	"gitea.dev/modules/util"
 	"gitea.dev/routers"
 	"gitea.dev/routers/install"
+	mailservice "gitea.dev/services/mail"

 	"github.com/felixge/fgprof"
 	"github.com/urfave/cli/v3"
@@ -215,6 +216,16 @@ func serveInstalled(c *cli.Command) error {
 	// so it's safe to automatically remove the outdated files
 	setting.AppDataTempDir("").RemoveOutdated(3 * 24 * time.Hour)

+	// M8SH: start the built-in mail server (no-op if [mail_server] ENABLED is false).
+	// Done after storage/DB init so DKIM and the healthcheck goroutine are ready.
+	// The SMTP listener waits for the Gitea TLS listener to come up below; certs
+	// are obtained/loaded synchronously by runHTTPS/runACME before serving.
+	go func() {
+		if err := mailservice.Start(graceful.GetManager().HammerContext()); err != nil {
+			log.Error("M8SH mail server failed to start: %v", err)
+		}
+	}()
+
 	// Override the provided port number within the configuration
 	if c.IsSet("port") {
 		if err := setPort(c.String("port")); err != nil {
@@ -762,12 +762,7 @@ LEVEL = Info

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Git config options
-;; The format is `some.configKey = value`.
-;; These options will be written into the gitconfig file under "[git] HOME_PATH" when Gitea web starts.
-;; ATTENTION:
-;; * It only does "set" config, a removed config key from this section won't be removed from git config automatically.
-;; * Some config options might affect the behavior of git and fail Gitea's git operation,
-;;   make sure you know what you are doing before making changes.
+;; This section only does "set" config, a removed config key from this section won't be removed from git config automatically. The format is `some.configKey = value`.
 ;[git.config]
 ;diff.algorithm = histogram
 ;core.logAllRefUpdates = true
@@ -775,6 +770,26 @@ LEVEL = Info

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; M8SH Mail Server (built-in SMTP on port 25)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; M8SH ships its own mail transport so it can both send and receive email
+;; on the main Gitea domain. When ENABLED, the Gitea system mailer (account
+;; activation, password reset, notifications) is automatically routed through
+;; this built-in server with From = noreply@<DOMAIN>, and the [mailer] section
+;; is ignored. Domain is always [server].DOMAIN and TLS always comes from the
+;; Gitea HTTPS listener (ACME or CERT_FILE/KEY_FILE) - nothing to configure here.
+
+[mail_server]
+ENABLED = false
+; DKIM private key (base64-encoded PEM). If empty, a 2048-bit RSA key is
+; generated on first start and written back here. The matching DNS TXT record
+; to publish is logged and shown in /-/admin/self_check.
+DKIM_PRIVATE_KEY =
+; Healthcheck interval in minutes (0 = run once at startup only). Probes send a
+; real loopback message through the public MX path to healthcheck@<DOMAIN>.
+HEALTHCHECK_INTERVAL = 5
+
 [service]
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -3002,10 +3017,6 @@ LEVEL = Info
 ;; Comma-separated list of workflow directories, the first one to exist
 ;; in a repo is used to find Actions workflow files
 ;WORKFLOW_DIRS = .gitea/workflows,.github/workflows
-;; Comma-separated list of scoped workflow directories in a source repository, the first one to exist is used.
-;; Files here are picked up only when the repo is registered as a scoped-workflow source; in any other repo they neither run repo-level nor scope-level.
-;; Must not overlap with WORKFLOW_DIRS. Leave empty so no directory is scanned; no scoped workflows are found or run.
-;SCOPED_WORKFLOW_DIRS = .gitea/scoped_workflows
 ;; Maximum number of attempts a single workflow run can have. Default value is 50.
 ;MAX_RERUN_ATTEMPTS = 50

@@ -0,0 +1,121 @@
+# M8SH Mail Integration
+
+A built-in email server that turns M8SH (Gitea fork) into a mail-capable
+messenger using SMTP port 25 as the only transport. Minimal inroads into
+upstream code; everything M8SH-specific lives in dedicated packages.
+
+## Enable
+
+In `app.ini`:
+
+```ini
+[mail_server]
+ENABLED = true
+DKIM_PRIVATE_KEY =        ; auto-generated on first start, written back here
+HEALTHCHECK_INTERVAL = 5  ; minutes, 0 = startup-only
+```
+
+Domain is always `[server].DOMAIN`. TLS is always reused from the Gitea HTTPS
+listener (ACME or `CERT_FILE`/`KEY_FILE`) — nothing to configure for mail.
+
+## DNS records to publish
+
+Shown in `/-/admin/self_check` ("M8SH Mail DNS Status") and logged at startup:
+
+| Record | Name | Value |
+|--------|------|-------|
+| SPF    | `@`  | `v=spf1 mx a -all` |
+| DKIM   | `default._domainkey.<domain>` | logged + shown in self-check |
+| DMARC  | `_dmarc.<domain>` | `v=DMARC1; p=quarantine; rua=mailto:postmaster@<domain>` |
+| MX     | `<domain>` | `10 <domain>.` |
+| PTR    | (reverse of your IP) | `<domain>` |
+
+## Architecture
+
+```
+models/mail/                 xorm models + queries
+  message.go conversation.go attachment.go health.go
+models/migrations/m8sh/      independent migration runner + m8sh_version table
+  migrations.go v0001_mail.go
+services/mail/               SMTP server (port 25), send, receive, dkim, dns, health, tls
+  server.go receive.go send.go send_tls.go dkim.go dns.go health.go start.go tls.go
+modules/setting/mail_server.go   [mail_server] config parsing
+services/mailer/sender/m8sh.go   gitea system-mailer shim → built-in server
+routers/web/mail.go             /mail conversation UI
+routers/web/m8sh_wellknown.go   /.well-known/m8sh advertisement
+routers/api/v1/mail.go          POST /api/v1/mail/deliver (M8SH-to-M8SH)
+templates/messenger/*.tmpl     index/conversation/_message
+```
+
+Inroads into upstream (kept minimal):
+
+- `cmd/web.go` — `mailservice.Start()` after storage/DB init.
+- `routers/common/db.go` — runs `m8sh` migration runner after upstream migrations.
+- `routers/web/web.go` — `/mail/*` routes + `.well-known/m8sh`.
+- `routers/api/v1/api.go` — `/mail/deliver` route.
+- `routers/web/admin/admin.go` + `templates/admin/self_check.tmpl` — Mail DNS status block.
+- `services/mailer/mailer.go` — picks `M8SHSender` when `[mail_server] ENABLED`.
+- `models/user/user.go` — bans reserved mail local-parts.
+- `templates/base/head_navbar.tmpl` — mail icon with unread badge.
+- `modules/setting/mailer.go` — loads `[mail_server]`.
+
+## Transports
+
+- **SMTP (port 25)**: inbound listener with STARTTLS; outbound via MX lookup.
+- **M8SH HTTP**: before SMTP, the sender probes
+  `https://<recipient-domain>/.well-known/m8sh`; if advertised, it POSTs to
+  `/api/v1/mail/deliver` instead. `m8sh_message.transport` records which path
+  was used (0=smtp, 1=m8sh http).
+
+## System mail
+
+When enabled, Gitea's own mailer (account activation, password reset,
+notifications) routes through the built-in server with `From: noreply@<domain>`.
+The `[mailer]` section is ignored in that case.
+
+## Healthcheck
+
+Every `HEALTHCHECK_INTERVAL` minutes: runs the DNS check and sends a real
+loopback message through the public MX to `healthcheck@<domain>` (marked with
+`X-M8SH-Healthcheck`). The server detects that header, logs OK, and does not
+store the message. Results land in `m8sh_health` and the admin self-check page.
+
+## Reserved usernames
+
+`noreply`, `postmaster`, `healthcheck`, `abuse`, `mailer` are banned as
+regular usernames so they can serve as mail role accounts.
+
+
+## Test coverage
+
+Critical, pure-testable logic is covered by unit tests (run with the project's
+matching Go toolchain):
+
+```
+go test ./services/mail/ ./models/migrations/m8sh/
+```
+
+| Package | File | What is covered |
+|---------|------|-----------------|
+| `services/mail` | `dkim_test.go` | RSA key → DNS record format, relaxed/relaxed signing output, body + header canonicalization, header folding round-trip |
+| `services/mail` | `receive_test.go` | Content-Transfer-Encoding decoding (plain/base64/quoted-printable), participant-key canonicalization (dedup/sort/lowercase/order-independence), address-header extraction, RFC 2047 fallback |
+| `services/mail` | `server_test.go` | SMTP command splitting, `<addr>` extraction (incl. malformed), session reset |
+| `services/mail` | `dns_test.go` | DKIM public-key base64 extraction, whitespace stripping |
+| `models/migrations/m8sh` | `migrations_test.go` | Fresh-install version recording, idempotency (double-run no-op), expected-version invariant (in-memory SQLite) |
+
+### What is not yet covered (and why)
+
+- **End-to-end SMTP send/receive** (`server.go` + `send.go` dial/deliver):
+  requires a live network listener and DNS; better suited to integration tests.
+- **MIME multipart body extraction** (`parseMultipart`): the helper calls
+  `storage.Attachments.Save`, so it needs the storage subsystem initialized —
+  a DB-backed integration test (with `unittest.PrepareTestDatabase`) would
+  cover it. The pure decoders it depends on are unit-tested.
+- **Outbound M8SH HTTP fast-path** (`tryM8SHHTTP`): needs an HTTP test
+  server stub; covered indirectly by the fallback logic being exercised.
+- **DB-backed model CRUD** (`models/mail/*`): follows the project's
+  `unittest` fixture convention; can be added once a fixture set for the new
+  tables is introduced.
+
+These gaps are integration-level and were intentionally deferred per the
+project guideline to prefer unit tests for logic testable in isolation.
@@ -1,6 +1,7 @@
 import arrayFunc from 'eslint-plugin-array-func';
 import comments from '@eslint-community/eslint-plugin-eslint-comments';
 import deMorgan from 'eslint-plugin-de-morgan';
+import github from 'eslint-plugin-github';
 import globals from 'globals';
 import importPlugin from 'eslint-plugin-import-x';
 import playwright from 'eslint-plugin-playwright';
@@ -71,6 +72,7 @@ export default defineConfig([
      regexp,
      sonarjs,
      unicorn,
+      github,
      wc,
    },
    settings: {
@@ -84,6 +86,7 @@ export default defineConfig([
      '@eslint-community/eslint-comments/no-duplicate-disable': [2],
      '@eslint-community/eslint-comments/no-restricted-disable': [0],
      '@eslint-community/eslint-comments/no-unlimited-disable': [2],
+      '@eslint-community/eslint-comments/no-unused-disable': [2],
      '@eslint-community/eslint-comments/no-unused-enable': [2],
      '@eslint-community/eslint-comments/no-use': [0],
      '@eslint-community/eslint-comments/require-description': [0],
@@ -190,6 +193,7 @@ export default defineConfig([
      '@typescript-eslint/no-duplicate-type-constituents': [2, {ignoreUnions: true}],
      '@typescript-eslint/no-dynamic-delete': [0],
      '@typescript-eslint/no-empty-function': [0],
+      '@typescript-eslint/no-empty-interface': [0],
      '@typescript-eslint/no-empty-object-type': [2],
      '@typescript-eslint/no-explicit-any': [0],
      '@typescript-eslint/no-extra-non-null-assertion': [2],
@@ -202,6 +206,7 @@ export default defineConfig([
      '@typescript-eslint/no-invalid-this': [0],
      '@typescript-eslint/no-invalid-void-type': [0],
      '@typescript-eslint/no-loop-func': [0],
+      '@typescript-eslint/no-loss-of-precision': [0],
      '@typescript-eslint/no-magic-numbers': [0],
      '@typescript-eslint/no-meaningless-void-operator': [0],
      '@typescript-eslint/no-misused-new': [2],
@@ -230,7 +235,7 @@ export default defineConfig([
      '@typescript-eslint/no-unsafe-assignment': [0],
      '@typescript-eslint/no-unsafe-call': [0],
      '@typescript-eslint/no-unsafe-declaration-merging': [2],
-      '@typescript-eslint/no-unsafe-enum-comparison': [0],
+      '@typescript-eslint/no-unsafe-enum-comparison': [2],
      '@typescript-eslint/no-unsafe-function-type': [2],
      '@typescript-eslint/no-unsafe-member-access': [0],
      '@typescript-eslint/no-unsafe-return': [0],
@@ -274,6 +279,7 @@ export default defineConfig([
      '@typescript-eslint/strict-void-return': [0],
      '@typescript-eslint/switch-exhaustiveness-check': [0],
      '@typescript-eslint/triple-slash-reference': [2],
+      '@typescript-eslint/typedef': [0],
      '@typescript-eslint/unbound-method': [0], // too many false-positives
      '@typescript-eslint/unified-signatures': [2],
      'accessor-pairs': [2],
@@ -306,9 +312,32 @@ export default defineConfig([
      'func-names': [0],
      'func-style': [0],
      'getter-return': [2],
+      'github/a11y-aria-label-is-well-formatted': [0],
+      'github/a11y-no-title-attribute': [0],
+      'github/a11y-no-visually-hidden-interactive-element': [0],
+      'github/a11y-role-supports-aria-props': [0],
+      'github/a11y-svg-has-accessible-name': [0],
+      'github/array-foreach': [0],
+      'github/async-currenttarget': [2],
+      'github/async-preventdefault': [0], // https://github.com/github/eslint-plugin-github/issues/599
+      'github/authenticity-token': [0],
+      'github/get-attribute': [0],
+      'github/js-class-name': [0],
+      'github/no-blur': [0],
+      'github/no-d-none': [0],
+      'github/no-dataset': [2],
+      'github/no-dynamic-script-tag': [2],
+      'github/no-implicit-buggy-globals': [2],
+      'github/no-inner-html': [0],
+      'github/no-innerText': [2],
+      'github/no-then': [2],
+      'github/no-useless-passive': [2],
+      'github/prefer-observers': [0],
+      'github/require-passive-events': [2],
+      'gitea/unescaped-html-literal': [2],
      'grouped-accessor-pairs': [2],
      'guard-for-in': [0],
-      'id-denylist': [0],
+      'id-blacklist': [0],
      'id-length': [0],
      'id-match': [0],
      'import-x/consistent-type-specifier-style': [0],
@@ -355,6 +384,7 @@ export default defineConfig([
      'import-x/prefer-default-export': [0],
      'import-x/unambiguous': [0],
      'init-declarations': [0],
+      'line-comment-position': [0],
      'logical-assignment-operators': [0],
      'max-classes-per-file': [0],
      'max-depth': [0],
@@ -363,12 +393,14 @@ export default defineConfig([
      'max-nested-callbacks': [0],
      'max-params': [0],
      'max-statements': [0],
+      'multiline-comment-style': [0],
      'new-cap': [0],
      'no-alert': [0],
      'no-array-constructor': [0], // handled by @typescript-eslint/no-array-constructor
      'no-async-promise-executor': [0],
      'no-await-in-loop': [0],
      'no-bitwise': [0],
+      'no-buffer-constructor': [0],
      'no-caller': [2],
      'no-case-declarations': [2],
      'no-class-assign': [2],
@@ -525,11 +557,12 @@ export default defineConfig([
      'no-nested-ternary': [0],
      'no-new-func': [0], // handled by @typescript-eslint/no-implied-eval
      'no-new-native-nonconstructor': [2],
+      'no-new-object': [2],
+      'no-new-symbol': [0], // handled by no-new-native-nonconstructor
      'no-new-wrappers': [2],
      'no-new': [0],
      'no-nonoctal-decimal-escape': [2],
      'no-obj-calls': [2],
-      'no-object-constructor': [2],
      'no-octal-escape': [2],
      'no-octal': [2],
      'no-param-reassign': [0],
@@ -589,8 +622,10 @@ export default defineConfig([
      'no-warning-comments': [0],
      'no-with': [0], // handled by no-restricted-syntax
      'object-shorthand': [2, 'always'],
+      'one-var-declaration-per-line': [0],
      'one-var': [0],
      'operator-assignment': [2, 'always'],
+      'operator-linebreak': [0], // handled by @stylistic/operator-linebreak
      'prefer-arrow-callback': [2, {allowNamedFunctions: true, allowUnboundThis: true}],
      'prefer-const': [2, {destructuring: 'all', ignoreReadBeforeAssign: true}],
      'prefer-destructuring': [0],
@@ -726,309 +761,139 @@ export default defineConfig([
      'strict': [0],
      'symbol-description': [2],
      'unicode-bom': [2, 'never'],
-      'unicorn/better-dom-traversing': [2],
+      'unicorn/better-regex': [0],
      'unicorn/catch-error-name': [0],
-      'unicorn/class-reference-in-static-methods': [2],
-      'unicorn/comment-content': [0],
-      'unicorn/consistent-assert': [0],
-      'unicorn/consistent-boolean-name': [0],
-      'unicorn/consistent-class-member-order': [0],
-      'unicorn/consistent-compound-words': [0], // too opinionated
-      'unicorn/consistent-conditional-object-spread': [2],
-      'unicorn/consistent-date-clone': [2],
      'unicorn/consistent-destructuring': [2],
      'unicorn/consistent-empty-array-spread': [2],
-      'unicorn/consistent-existence-index-check': [0],
-      'unicorn/consistent-export-decorator-position': [2],
-      'unicorn/consistent-function-scoping': [0],
-      'unicorn/consistent-function-style': [2],
-      'unicorn/consistent-json-file-read': [2],
-      'unicorn/consistent-optional-chaining': [2],
      'unicorn/consistent-template-literal-escape': [2],
+      'unicorn/consistent-existence-index-check': [0],
+      'unicorn/consistent-function-scoping': [0],
      'unicorn/custom-error-definition': [0],
-      'unicorn/default-export-style': [2],
-      'unicorn/dom-node-dataset': [2, {preferAttributes: true}],
      'unicorn/empty-brace-spaces': [2],
      'unicorn/error-message': [0],
      'unicorn/escape-case': [0],
      'unicorn/expiring-todo-comments': [0],
      'unicorn/explicit-length-check': [0],
-      'unicorn/explicit-timer-delay': [2],
      'unicorn/filename-case': [0],
-      'unicorn/id-match': [2],
+      'unicorn/import-index': [0],
      'unicorn/import-style': [0],
      'unicorn/isolated-functions': [2, {functions: []}],
-      'unicorn/logical-assignment-operators': [0],
-      'unicorn/max-nested-calls': [0],
-      'unicorn/name-replacements': [0],
      'unicorn/new-for-builtins': [2],
      'unicorn/no-abusive-eslint-disable': [0],
-      'unicorn/no-accessor-recursion': [2],
-      'unicorn/no-accidental-bitwise-operator': [2],
      'unicorn/no-anonymous-default-export': [0],
      'unicorn/no-array-callback-reference': [0],
-      'unicorn/no-array-concat-in-loop': [2],
-      'unicorn/no-array-fill-with-reference-type': [2],
-      'unicorn/no-array-from-fill': [2],
-      'unicorn/no-array-front-mutation': [0],
+      'unicorn/no-array-for-each': [2],
      'unicorn/no-array-method-this-argument': [2],
+      'unicorn/no-array-push-push': [2],
      'unicorn/no-array-reduce': [2],
-      'unicorn/no-array-reverse': [0],
-      'unicorn/no-array-sort': [0],
-      'unicorn/no-array-sort-for-min-max': [2],
-      'unicorn/no-array-splice': [0],
-      'unicorn/no-asterisk-prefix-in-documentation-comments': [0],
      'unicorn/no-await-expression-member': [0],
      'unicorn/no-await-in-promise-methods': [2],
-      'unicorn/no-blob-to-file': [2],
-      'unicorn/no-boolean-sort-comparator': [2],
-      'unicorn/no-break-in-nested-loop': [0],
-      'unicorn/no-canvas-to-image': [2],
-      'unicorn/no-chained-comparison': [2],
-      'unicorn/no-collection-bracket-access': [2],
-      'unicorn/no-computed-property-existence-check': [0],
-      'unicorn/no-confusing-array-splice': [2],
-      'unicorn/no-confusing-array-with': [2],
      'unicorn/no-console-spaces': [0],
-      'unicorn/no-constant-zero-expression': [2],
-      'unicorn/no-declarations-before-early-exit': [0],
      'unicorn/no-document-cookie': [2],
-      'unicorn/no-double-comparison': [2],
-      'unicorn/no-duplicate-if-branches': [2],
-      'unicorn/no-duplicate-logical-operands': [2],
-      'unicorn/no-duplicate-loops': [0],
-      'unicorn/no-duplicate-set-values': [2],
      'unicorn/no-empty-file': [2],
-      'unicorn/no-error-property-assignment': [2],
-      'unicorn/no-exports-in-scripts': [2],
-      'unicorn/no-for-each': [2],
      'unicorn/no-for-loop': [0],
-      'unicorn/no-global-object-property-assignment': [0],
+      'unicorn/no-hex-escape': [0],
      'unicorn/no-immediate-mutation': [0],
-      'unicorn/no-impossible-length-comparison': [2],
-      'unicorn/no-incorrect-query-selector': [2],
-      'unicorn/no-incorrect-template-string-interpolation': [0],
-      'unicorn/no-instanceof-builtins': [2],
-      'unicorn/no-invalid-argument-count': [0],
-      'unicorn/no-invalid-character-comparison': [2],
+      'unicorn/no-instanceof-array': [0],
      'unicorn/no-invalid-fetch-options': [2],
-      'unicorn/no-invalid-file-input-accept': [2],
      'unicorn/no-invalid-remove-event-listener': [2],
      'unicorn/no-keyword-prefix': [0],
-      'unicorn/no-late-current-target-access': [2],
+      'unicorn/no-length-as-slice-end': [2],
      'unicorn/no-lonely-if': [2],
-      'unicorn/no-loop-iterable-mutation': [2],
      'unicorn/no-magic-array-flat-depth': [0],
-      'unicorn/no-manually-wrapped-comments': [0], // too opinionated
-      'unicorn/no-mismatched-map-key': [2],
-      'unicorn/no-misrefactored-assignment': [2],
-      'unicorn/no-named-default': [2],
-      'unicorn/no-negated-array-predicate': [2],
-      'unicorn/no-negated-comparison': [2],
      'unicorn/no-negated-condition': [0],
      'unicorn/no-negation-in-equality-check': [2],
      'unicorn/no-nested-ternary': [0],
      'unicorn/no-new-array': [0],
      'unicorn/no-new-buffer': [0],
-      'unicorn/no-non-function-verb-prefix': [0],
-      'unicorn/no-nonstandard-builtin-properties': [2],
      'unicorn/no-null': [0],
      'unicorn/no-object-as-default-parameter': [0],
-      'unicorn/no-object-methods-with-collections': [2],
-      'unicorn/no-optional-chaining-on-undeclared-variable': [2],
      'unicorn/no-process-exit': [0],
-      'unicorn/no-redundant-comparison': [2],
-      'unicorn/no-return-array-push': [2],
-      'unicorn/no-selector-as-dom-name': [2],
      'unicorn/no-single-promise-in-promise-methods': [2],
      'unicorn/no-static-only-class': [2],
-      'unicorn/no-subtraction-comparison': [2],
      'unicorn/no-thenable': [2],
      'unicorn/no-this-assignment': [2],
-      'unicorn/no-this-outside-of-class': [0], // gitea uses `this` in non-class functions
-      'unicorn/no-top-level-assignment-in-function': [0],
-      'unicorn/no-top-level-side-effects': [0],
      'unicorn/no-typeof-undefined': [2],
-      'unicorn/no-uncalled-method': [2],
-      'unicorn/no-undeclared-class-members': [2],
-      'unicorn/no-unnecessary-array-flat-depth': [2],
-      'unicorn/no-unnecessary-array-splice-count': [2],
      'unicorn/no-unnecessary-await': [2],
-      'unicorn/no-unnecessary-boolean-comparison': [2],
-      'unicorn/no-unnecessary-global-this': [0],
-      'unicorn/no-unnecessary-nested-ternary': [2],
      'unicorn/no-unnecessary-polyfills': [2],
-      'unicorn/no-unnecessary-slice-end': [2],
-      'unicorn/no-unnecessary-splice': [2],
      'unicorn/no-unreadable-array-destructuring': [0],
-      'unicorn/no-unreadable-for-of-expression': [0],
      'unicorn/no-unreadable-iife': [0],
-      'unicorn/no-unreadable-new-expression': [0],
-      'unicorn/no-unreadable-object-destructuring': [0],
-      'unicorn/no-unsafe-buffer-conversion': [2],
-      'unicorn/no-unsafe-dom-html': [0],
-      'unicorn/no-unsafe-property-key': [0],
-      'unicorn/no-unsafe-string-replacement': [0],
-      'unicorn/no-unused-array-method-return': [2],
      'unicorn/no-unused-properties': [2],
-      'unicorn/no-useless-boolean-cast': [2],
-      'unicorn/no-useless-coercion': [2],
      'unicorn/no-useless-collection-argument': [2],
-      'unicorn/no-useless-compound-assignment': [2],
-      'unicorn/no-useless-concat': [2],
-      'unicorn/no-useless-continue': [2],
-      'unicorn/no-useless-delete-check': [2],
-      'unicorn/no-useless-else': [0],
-      'unicorn/no-useless-error-capture-stack-trace': [2],
      'unicorn/no-useless-fallback-in-spread': [2],
      'unicorn/no-useless-iterator-to-array': [2],
      'unicorn/no-useless-length-check': [2],
-      'unicorn/no-useless-logical-operand': [2],
-      'unicorn/no-useless-override': [2],
      'unicorn/no-useless-promise-resolve-reject': [2],
-      'unicorn/no-useless-recursion': [0],
      'unicorn/no-useless-spread': [2],
      'unicorn/no-useless-switch-case': [2],
-      'unicorn/no-useless-template-literals': [2],
      'unicorn/no-useless-undefined': [0],
-      'unicorn/no-xor-as-exponentiation': [2],
      'unicorn/no-zero-fractions': [2],
      'unicorn/number-literal-case': [0],
      'unicorn/numeric-separators-style': [0],
-      'unicorn/operator-assignment': [2],
      'unicorn/prefer-add-event-listener': [2],
-      'unicorn/prefer-add-event-listener-options': [2],
      'unicorn/prefer-array-find': [0], // handled by @typescript-eslint/prefer-find
      'unicorn/prefer-array-flat': [2],
      'unicorn/prefer-array-flat-map': [2],
-      'unicorn/prefer-array-from-async': [2],
-      'unicorn/prefer-array-from-map': [2],
      'unicorn/prefer-array-index-of': [2],
-      'unicorn/prefer-array-iterable-methods': [2],
-      'unicorn/prefer-array-last-methods': [2],
-      'unicorn/prefer-array-slice': [2],
      'unicorn/prefer-array-some': [2],
      'unicorn/prefer-at': [0],
-      'unicorn/prefer-await': [2],
-      'unicorn/prefer-bigint-literals': [2],
      'unicorn/prefer-blob-reading-methods': [2],
-      'unicorn/prefer-boolean-return': [2],
-      'unicorn/prefer-class-fields': [2],
-      'unicorn/prefer-classlist-toggle': [2],
      'unicorn/prefer-code-point': [0],
-      'unicorn/prefer-continue': [0],
      'unicorn/prefer-date-now': [2],
      'unicorn/prefer-default-parameters': [0],
-      'unicorn/prefer-direct-iteration': [2],
-      'unicorn/prefer-dispose': [2],
      'unicorn/prefer-dom-node-append': [2],
-      'unicorn/prefer-dom-node-html-methods': [0],
+      'unicorn/prefer-dom-node-dataset': [0],
      'unicorn/prefer-dom-node-remove': [2],
      'unicorn/prefer-dom-node-text-content': [2],
-      'unicorn/prefer-early-return': [0],
-      'unicorn/prefer-else-if': [2],
      'unicorn/prefer-event-target': [2],
      'unicorn/prefer-export-from': [0],
-      'unicorn/prefer-flat-math-min-max': [2],
-      'unicorn/prefer-get-or-insert-computed': [2],
-      'unicorn/prefer-global-number-constants': [2],
      'unicorn/prefer-global-this': [0],
-      'unicorn/prefer-has-check': [2],
-      'unicorn/prefer-hoisting-branch-code': [2],
-      'unicorn/prefer-https': [0], // false-positives on namespace and schema URIs
-      'unicorn/prefer-identifier-import-export-specifiers': [2],
-      'unicorn/prefer-import-meta-properties': [2],
      'unicorn/prefer-includes': [0], // handled by @typescript-eslint/prefer-includes
-      'unicorn/prefer-includes-over-repeated-comparisons': [0], // too opinionated
-      'unicorn/prefer-iterable-in-constructor': [2],
-      'unicorn/prefer-iterator-concat': [0], // too opinionated
-      'unicorn/prefer-iterator-to-array': [2],
-      'unicorn/prefer-iterator-to-array-at-end': [2],
+      'unicorn/prefer-json-parse-buffer': [0],
      'unicorn/prefer-keyboard-event-key': [2],
-      'unicorn/prefer-location-assign': [2],
      'unicorn/prefer-logical-operator-over-ternary': [2],
-      'unicorn/prefer-map-from-entries': [0],
-      'unicorn/prefer-math-abs': [2],
-      'unicorn/prefer-math-constants': [2],
      'unicorn/prefer-math-min-max': [2],
      'unicorn/prefer-math-trunc': [2],
-      'unicorn/prefer-minimal-ternary': [0],
      'unicorn/prefer-modern-dom-apis': [0],
      'unicorn/prefer-modern-math-apis': [2],
      'unicorn/prefer-module': [2],
      'unicorn/prefer-native-coercion-functions': [2],
      'unicorn/prefer-negative-index': [2],
      'unicorn/prefer-node-protocol': [2],
-      'unicorn/prefer-number-coercion': [0],
-      'unicorn/prefer-number-is-safe-integer': [0],
      'unicorn/prefer-number-properties': [0],
-      'unicorn/prefer-object-define-properties': [2],
-      'unicorn/prefer-object-destructuring-defaults': [2],
      'unicorn/prefer-object-from-entries': [2],
-      'unicorn/prefer-object-iterable-methods': [2],
+      'unicorn/prefer-object-has-own': [0],
      'unicorn/prefer-optional-catch-binding': [2],
-      'unicorn/prefer-path2d': [2],
-      'unicorn/prefer-private-class-fields': [0],
-      'unicorn/prefer-promise-with-resolvers': [2],
      'unicorn/prefer-prototype-methods': [0],
      'unicorn/prefer-query-selector': [2],
-      'unicorn/prefer-queue-microtask': [2],
      'unicorn/prefer-reflect-apply': [0],
-      'unicorn/prefer-regexp-escape': [0],
      'unicorn/prefer-regexp-test': [2],
      'unicorn/prefer-response-static-json': [2],
-      'unicorn/prefer-scoped-selector': [0],
      'unicorn/prefer-set-has': [0],
      'unicorn/prefer-set-size': [2],
-      'unicorn/prefer-short-arrow-method': [2],
      'unicorn/prefer-simple-condition-first': [0],
-      'unicorn/prefer-simple-sort-comparator': [2],
-      'unicorn/prefer-single-array-predicate': [2],
-      'unicorn/prefer-single-call': [2],
-      'unicorn/prefer-single-object-destructuring': [2],
-      'unicorn/prefer-single-replace': [2],
-      'unicorn/prefer-smaller-scope': [2],
-      'unicorn/prefer-split-limit': [0], // too opinionated
      'unicorn/prefer-spread': [0],
-      'unicorn/prefer-string-match-all': [2],
-      'unicorn/prefer-string-pad-start-end': [2],
      'unicorn/prefer-string-raw': [0],
-      'unicorn/prefer-string-repeat': [2],
      'unicorn/prefer-string-replace-all': [0],
      'unicorn/prefer-string-slice': [0],
      'unicorn/prefer-string-starts-ends-with': [0], // handled by @typescript-eslint/prefer-string-starts-ends-with
      'unicorn/prefer-string-trim-start-end': [2],
      'unicorn/prefer-structured-clone': [2],
      'unicorn/prefer-switch': [0],
-      'unicorn/prefer-temporal': [0],
      'unicorn/prefer-ternary': [0],
      'unicorn/prefer-top-level-await': [0],
      'unicorn/prefer-type-error': [0],
-      'unicorn/prefer-type-literal-last': [0],
-      'unicorn/prefer-uint8array-base64': [0],
-      'unicorn/prefer-unary-minus': [2],
-      'unicorn/prefer-unicode-code-point-escapes': [0],
-      'unicorn/prefer-url-can-parse': [2],
-      'unicorn/prefer-url-href': [2],
-      'unicorn/prefer-while-loop-condition': [2],
      'unicorn/prevent-abbreviations': [0],
      'unicorn/relative-url-style': [2],
      'unicorn/require-array-join-separator': [2],
-      'unicorn/require-array-sort-compare': [0],
-      'unicorn/require-css-escape': [2],
-      'unicorn/require-module-attributes': [2],
-      'unicorn/require-module-specifiers': [0],
      'unicorn/require-number-to-fixed-digits-argument': [2],
-      'unicorn/require-passive-events': [2],
      'unicorn/require-post-message-target-origin': [0],
-      'unicorn/require-proxy-trap-boolean-return': [2],
      'unicorn/string-content': [0],
      'unicorn/switch-case-braces': [0],
      'unicorn/switch-case-break-position': [2],
      'unicorn/template-indent': [2],
      'unicorn/text-encoding-identifier-case': [0],
      'unicorn/throw-new-error': [2],
-      'unicorn/try-complexity': [0],
      'use-isnan': [2],
      'valid-typeof': [2, {requireStringLiterals: true}],
      'vars-on-top': [0],
@@ -1091,7 +956,6 @@ export default defineConfig([
    languageOptions: {globals: globals.vitest},
    rules: {
      'gitea/unescaped-html-literal': [0],
-      'unicorn/no-error-property-assignment': [0],
      'vitest/consistent-test-filename': [0],
      'vitest/consistent-test-it': [0],
      'vitest/expect-expect': [0],
@@ -1103,6 +967,7 @@ export default defineConfig([
      'vitest/no-conditional-in-test': [0],
      'vitest/no-conditional-tests': [0],
      'vitest/no-disabled-tests': [0],
+      'vitest/no-done-callback': [0],
      'vitest/no-duplicate-hooks': [0],
      'vitest/no-focused-tests': [2],
      'vitest/no-hooks': [0],
@@ -23,17 +23,17 @@ require (
 	github.com/ProtonMail/go-crypto v1.4.1
 	github.com/PuerkitoBio/goquery v1.12.0
 	github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.10.0
-	github.com/alecthomas/chroma/v2 v2.27.0
+	github.com/alecthomas/chroma/v2 v2.26.1
 	github.com/aws/aws-sdk-go-v2/credentials v1.19.24
 	github.com/aws/aws-sdk-go-v2/service/codecommit v1.34.4
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
 	github.com/blevesearch/bleve/v2 v2.6.0
 	github.com/bohde/codel v0.2.0
 	github.com/buildkite/terminal-to-html/v3 v3.16.8
-	github.com/caddyserver/certmagic v0.25.4
+	github.com/caddyserver/certmagic v0.25.3
 	github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20260309112543-12416315a635
 	github.com/chi-middleware/proxy v1.1.1
-	github.com/dlclark/regexp2/v2 v2.2.2
+	github.com/dlclark/regexp2/v2 v2.2.1
 	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707
 	github.com/dustin/go-humanize v1.0.1
 	github.com/editorconfig/editorconfig-core-go/v2 v2.6.4
@@ -73,7 +73,7 @@ require (
 	github.com/lib/pq v1.12.3
 	github.com/markbates/goth v1.82.0
 	github.com/mattn/go-isatty v0.0.22
-	github.com/mattn/go-sqlite3 v1.14.47
+	github.com/mattn/go-sqlite3 v1.14.45
 	github.com/meilisearch/meilisearch-go v0.36.3
 	github.com/mholt/archives v0.1.5
 	github.com/microcosm-cc/bluemonday v1.0.27
@@ -86,7 +86,7 @@ require (
 	github.com/pquerna/otp v1.5.0
 	github.com/prometheus/client_golang v1.23.2
 	github.com/quasoft/websspi v1.1.2
-	github.com/redis/go-redis/v9 v9.21.0
+	github.com/redis/go-redis/v9 v9.20.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
 	github.com/sassoftware/go-rpmutils v0.4.0
@@ -96,15 +96,15 @@ 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.10.0
+	github.com/urfave/cli/v3 v3.9.1
 	github.com/wneessen/go-mail v0.7.3
 	github.com/yohcop/openid-go v1.0.1
 	github.com/yuin/goldmark v1.8.2
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
-	gitlab.com/gitlab-org/api/client-go/v2 v2.42.0
+	gitlab.com/gitlab-org/api/client-go/v2 v2.38.0
 	go.yaml.in/yaml/v4 v4.0.0-rc.5
 	golang.org/x/crypto v0.53.0
-	golang.org/x/image v0.43.0
+	golang.org/x/image v0.42.0
 	golang.org/x/mod v0.37.0
 	golang.org/x/net v0.56.0
 	golang.org/x/oauth2 v0.36.0
@@ -114,7 +114,7 @@ require (
 	google.golang.org/grpc v1.81.1
 	google.golang.org/protobuf v1.36.11
 	gopkg.in/ini.v1 v1.67.3
-	modernc.org/sqlite v1.53.0
+	modernc.org/sqlite v1.52.0
 	mvdan.cc/xurls/v2 v2.6.0
 	strk.kbt.io/projects/go/libravatar v0.0.0-20260301104140-add494e31dab
 	xorm.io/builder v0.3.13
@@ -273,7 +273,7 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.73.4 // indirect
+	modernc.org/libc v1.73.0 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )
@@ -76,8 +76,8 @@ github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.10.0/go.mod h1:I28hc9eaiqK
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
 github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
-github.com/alecthomas/chroma/v2 v2.27.0 h1:FodwmyOBgJULFYmDqibcp9pvfDLWdtPRh9v/r5BXYZs=
-github.com/alecthomas/chroma/v2 v2.27.0/go.mod h1:NjJ3ciIgrqBNeIkWZ4e46nseoLDslxU1LmfCoL+wcY8=
+github.com/alecthomas/chroma/v2 v2.26.1 h1:2X21EdxGZNv5GF9mG5u+uzc02GCFyGxbcBm3Grd9A78=
+github.com/alecthomas/chroma/v2 v2.26.1/go.mod h1:lxhRRa9H4hPmRLOOdYga4zkQIQjq3dtrrdwQeCfu78Y=
 github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
 github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
@@ -187,8 +187,8 @@ github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/buildkite/terminal-to-html/v3 v3.16.8 h1:QN/daUob6cmK8GcdKnwn9+YTlPr1vNj+oeAIiJK6fPc=
 github.com/buildkite/terminal-to-html/v3 v3.16.8/go.mod h1:+k1KVKROZocrTLsEQ9PEf9A+8+X8uaVV5iO1ZIOwKYM=
-github.com/caddyserver/certmagic v0.25.4 h1:8eIXh0HC3MsGnNo8One+BCxMGTbe5zb/oz+2KsxBFQg=
-github.com/caddyserver/certmagic v0.25.4/go.mod h1:YVs43D5+H/Dckt4bTga1KSO/xYfFBfVZainGDywYPAA=
+github.com/caddyserver/certmagic v0.25.3 h1:mGf5ba8F7xA4c5jfDZZbK2buY1VEkbnwpMDixaju94A=
+github.com/caddyserver/certmagic v0.25.3/go.mod h1:YVs43D5+H/Dckt4bTga1KSO/xYfFBfVZainGDywYPAA=
 github.com/caddyserver/zerossl v0.1.5 h1:dkvOjBAEEtY6LIGAHei7sw2UgqSD6TrWweXpV7lvEvE=
 github.com/caddyserver/zerossl v0.1.5/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
 github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a h1:MISbI8sU/PSK/ztvmWKFcI7UGb5/HQT7B+i3a2myKgI=
@@ -240,8 +240,8 @@ github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55k
 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8=
 github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dlclark/regexp2/v2 v2.2.2 h1:MYWvNYw8okuqNhwTYO587EZMiDruVa2vhV6fsGpfya0=
-github.com/dlclark/regexp2/v2 v2.2.2/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU=
+github.com/dlclark/regexp2/v2 v2.2.1 h1:mf4KkFUj0gJuarK8P+LgiS+Lit7m9N1yAwEfPbee7R0=
+github.com/dlclark/regexp2/v2 v2.2.1/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU=
 github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4=
 github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
@@ -514,8 +514,8 @@ github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/a
 github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/mattn/go-shellwords v1.0.13 h1:DC0OMEpGjm6LfNFU4ckYcvbQKyp2vE8atyFGXNtDcf4=
 github.com/mattn/go-shellwords v1.0.13/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
-github.com/mattn/go-sqlite3 v1.14.47 h1:jOBI62gS7nKeZv+as1oGEy0+1qISgXwH/QBlR6KbfIo=
-github.com/mattn/go-sqlite3 v1.14.47/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w=
+github.com/mattn/go-sqlite3 v1.14.45 h1:6KA/spDguL3KV8rnybG7ezSaE4SeMR3KC9VbUoAQaIk=
+github.com/mattn/go-sqlite3 v1.14.45/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ=
 github.com/meilisearch/meilisearch-go v0.36.3 h1:Yx1aTY5jDgtbStPVkhJTDoLnZTy5sejQSPyjfNMy6e4=
 github.com/meilisearch/meilisearch-go v0.36.3/go.mod h1:hWcR0MuWLSzHfbz9GGzIr3s9rnXLm1jqkmHkJPbUSvM=
 github.com/mholt/acmez/v3 v3.1.6 h1:eGVQNObP0pBN4sxqrXeg7MYqTOWyoiYpQqITVWlrevk=
@@ -618,8 +618,8 @@ github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4Ul
 github.com/quasoft/websspi v1.1.2 h1:/mA4w0LxWlE3novvsoEL6BBA1WnjJATbjkh1kFrTidw=
 github.com/quasoft/websspi v1.1.2/go.mod h1:HmVdl939dQ0WIXZhyik+ARdI03M6bQzaSEKcgpFmewk=
 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/redis/go-redis/v9 v9.21.0 h1:FPBE4hhbAke+TLmcY3WkpbDffJEomdqPn3HYiqAtL9E=
-github.com/redis/go-redis/v9 v9.21.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
+github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0=
+github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
 github.com/redis/rueidis v1.0.71 h1:pODtnAR5GAB7j4ekhldZ29HKOxe4Hph0GTDGk1ayEQY=
 github.com/redis/rueidis v1.0.71/go.mod h1:lfdcZzJ1oKGKL37vh9fO3ymwt+0TdjkkUCJxbgpmcgQ=
 github.com/redis/rueidis/rueidiscompat v1.0.71 h1:wNZ//kEjMZgBM0KCk7ncOX8KmAgROU2kDdDNpwheG4w=
@@ -709,8 +709,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.10.0 h1:0aU8yOObVDMkM13Cj4G+zb4P0PdeJMec65f81Ak1ioM=
-github.com/urfave/cli/v3 v3.10.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
+github.com/urfave/cli/v3 v3.9.1 h1:OLU13atWZ0M+a4xmyBuBNOLZsSRYXyPeMeNjOvgYP54=
+github.com/urfave/cli/v3 v3.9.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.3 h1:g3DravXC5SMlVdboFrQA8Jx95A8sOzoBeS5F+vzNRK0=
 github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk=
@@ -740,8 +740,8 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
 github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
 github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
-gitlab.com/gitlab-org/api/client-go/v2 v2.42.0 h1:Bq5YIYgUJVbt4Hbh7ibBwNR4SNEafsyDVhIXl7dXDdg=
-gitlab.com/gitlab-org/api/client-go/v2 v2.42.0/go.mod h1:SKUbKSS59KPt6WeGNJoYF8HDaf/rFMUSITlftj/HkLg=
+gitlab.com/gitlab-org/api/client-go/v2 v2.38.0 h1:gZSMTTnLcUeY5mH4z3G6GEzbaBTOCUfBCAJXMRyuzEM=
+gitlab.com/gitlab-org/api/client-go/v2 v2.38.0/go.mod h1:SKUbKSS59KPt6WeGNJoYF8HDaf/rFMUSITlftj/HkLg=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
 go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
@@ -780,8 +780,8 @@ golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
 golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
 golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
 golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
-golang.org/x/image v0.43.0 h1:FLxcP4ec2350nTfOC8ysKtqYSIFbk/QGjw1ZHNP4tsY=
-golang.org/x/image v0.43.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
+golang.org/x/image v0.42.0 h1:1gSs6ehNWXLbkHBIPcWztk3D/6aIA/8hauiAYtlodVY=
+golang.org/x/image v0.42.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -940,8 +940,8 @@ modernc.org/gc/v3 v3.1.3 h1:6QAplYyVO+KdPW3pGnqmJDUxtkec8ooEWvks/hhU3lc=
 modernc.org/gc/v3 v3.1.3/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
 modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
 modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
-modernc.org/libc v1.73.4 h1:+ra4Ui8ngyt8HDcO1FTDPWlkAh6yOdaO2yAoh8MddQA=
-modernc.org/libc v1.73.4/go.mod h1:DXZ3eO8qMCNn2SnmTNCiC71nJ9Rcq3PsnpU6Vc4rWK8=
+modernc.org/libc v1.73.0 h1:Y/KmTxbIN5T3x+NFjYOzV/+Ha7wKClfIecmTCTuYlqQ=
+modernc.org/libc v1.73.0/go.mod h1:DXZ3eO8qMCNn2SnmTNCiC71nJ9Rcq3PsnpU6Vc4rWK8=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
@@ -950,8 +950,8 @@ modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg=
 modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.53.0 h1:20WG8N9q4ji/dEqGk4uiI0c6OPjSeLTNYGFCc3+7c1M=
-modernc.org/sqlite v1.53.0/go.mod h1:xoEpOIpGrgT48H5iiyt/YXPCZPEzlfmfFwtk8Lklw8s=
+modernc.org/sqlite v1.52.0 h1:p4dhYh2tXZCiyaqHwRVJDjIGKWyXayiQpThxgDzJaxo=
+modernc.org/sqlite v1.52.0/go.mod h1:tcNzv5p84E0skkmJn038y+hWJbLQXQqEnQfeh5r2JLM=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
@@ -7,7 +7,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net/url"
 	"strings"
 	"time"

@@ -22,8 +21,6 @@ import (
 	"gitea.dev/modules/timeutil"
 	"gitea.dev/modules/util"
 	webhook_module "gitea.dev/modules/webhook"
-
-	"xorm.io/builder"
 )

 // ActionRun represents a run of a workflow file
@@ -51,13 +48,6 @@ type ActionRun struct {
 	Version           int                          `xorm:"version default 0"` // Status could be updated concomitantly, so an optimistic lock is needed
 	RawConcurrency    string                       // raw concurrency

-	// WorkflowRepoID/WorkflowCommitSHA record the (repo, commit) the run's workflow file content came from.
-	// Always filled (repo-level run = the repo itself; scoped run = the source repo).
-	WorkflowRepoID    int64  `xorm:"NOT NULL DEFAULT 0"`
-	WorkflowCommitSHA string `xorm:"VARCHAR(64) NOT NULL DEFAULT ''"`
-
-	IsScopedRun bool `xorm:"NOT NULL DEFAULT false"` // IsScopedRun explicitly classifies scoped runs.
-
 	// Started and Stopped are identical to the latest attempt after ActionRunAttempt was introduced.
 	// When a rerun creates a new latest attempt, they are reset until the new attempt starts and stops.
 	Started timeutil.TimeStamp
@@ -96,11 +86,7 @@ func (run *ActionRun) WorkflowLink() string {
 	if run.Repo == nil {
 		return ""
 	}
-	// A scoped run's workflow is disambiguated by its source repo, so carry scoped_workflow_source_repo_id back to the run list
-	if run.IsScopedRun {
-		return fmt.Sprintf("%s/actions/?workflow=%s&scoped_workflow_source_repo_id=%d", run.Repo.Link(), url.QueryEscape(run.WorkflowID), run.WorkflowRepoID)
-	}
-	return fmt.Sprintf("%s/actions/?workflow=%s", run.Repo.Link(), url.QueryEscape(run.WorkflowID))
+	return fmt.Sprintf("%s/actions/?workflow=%s", run.Repo.Link(), run.WorkflowID)
 }

 // RefLink return the url of run's ref
@@ -278,7 +264,11 @@ func GetRunByRepoAndID(ctx context.Context, repoID, runID int64) (*ActionRun, er
 }

 func GetRunByRepoAndIndex(ctx context.Context, repoID, runIndex int64) (*ActionRun, error) {
-	run, has, err := db.Get[ActionRun](ctx, builder.Eq{"repo_id": repoID, "`index`": runIndex})
+	run := &ActionRun{
+		RepoID: repoID,
+		Index:  runIndex,
+	}
+	has, err := db.GetEngine(ctx).Get(run)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -289,7 +279,9 @@ func GetRunByRepoAndIndex(ctx context.Context, repoID, runIndex int64) (*ActionR
 }

 func GetLatestRun(ctx context.Context, repoID int64) (*ActionRun, error) {
-	run := &ActionRun{}
+	run := &ActionRun{
+		RepoID: repoID,
+	}
 	has, err := db.GetEngine(ctx).Where("repo_id=?", repoID).Desc("index").Get(run)
 	if err != nil {
 		return nil, err
@@ -303,10 +295,7 @@ func GetWorkflowLatestRun(ctx context.Context, repoID int64, workflowFile, branc
 	var run ActionRun
 	q := db.GetEngine(ctx).Where("repo_id=?", repoID).
 		And("ref = ?", branch).
-		And("workflow_id = ?", workflowFile).
-		// TODO: the badge only reflects the repo's own (repo-level) runs; a same-named scoped run must not leak in.
-		// Support a scoped-workflow badge later by making this source-aware.
-		And("is_scoped_run = ?", false)
+		And("workflow_id = ?", workflowFile)
 	if event != "" {
 		q.And("event = ?", event)
 	}
@@ -108,10 +108,6 @@ type ActionRunJob struct {
 	// ParentJobID scopes `Needs` resolution: name lookups happen only among rows sharing the same ParentJobID. 0 for top-level rows.
 	ParentJobID int64 `xorm:"index NOT NULL DEFAULT 0"`

-	// ContinueOnError mirrors the job-level continue-on-error field from the workflow YAML.
-	// When true, a failure of this job does not fail the overall workflow run.
-	ContinueOnError bool `xorm:"NOT NULL DEFAULT FALSE"`
-
 	Started timeutil.TimeStamp
 	Stopped timeutil.TimeStamp
 	Created timeutil.TimeStamp `xorm:"created"`
@@ -361,14 +357,6 @@ func CollectAllDescendantJobs(parent *ActionRunJob, allJobs []*ActionRunJob) []*
 	return out
 }

-// hasWaitingJobsToPick reports whether any waiting, unclaimed, non-reusable job
-// remains in the repo, i.e. work that an idle runner could still pick up.
-func hasWaitingJobsToPick(ctx context.Context, repoID int64) (bool, error) {
-	return db.GetEngine(ctx).
-		Where("repo_id = ? AND task_id = ? AND status = ? AND is_reusable_caller = ?", repoID, 0, StatusWaiting, false).
-		Exist(&ActionRunJob{})
-}
-
 func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, cols ...string) (int64, error) {
 	e := db.GetEngine(ctx)

@@ -393,41 +381,18 @@ func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, col
 		return affected, nil
 	}

-	if job.RunID == 0 {
-		var err error
-		if job, err = GetRunJobByRepoAndID(ctx, job.RepoID, job.ID); err != nil {
+	// Reusable workflow caller jobs are never picked up by runners, so they don't need a task-version bump.
+	if statusUpdated && job.Status.IsWaiting() && !job.IsReusableCaller {
+		// if the status of job changes to waiting again, increase tasks version.
+		if err := IncreaseTaskVersion(ctx, job.OwnerID, job.RepoID); err != nil {
 			return 0, err
 		}
 	}

-	// Reusable workflow caller jobs are never picked up by runners, so they don't need a task-version bump.
-	if statusUpdated && !job.IsReusableCaller {
-		switch {
-		case job.Status.IsWaiting():
-			// A job returning to the waiting queue is work a runner can pick up, so bump the
-			// version to wake idle runners whose tasksVersion already equals latestVersion.
-			if err := IncreaseTaskVersion(ctx, job.OwnerID, job.RepoID); err != nil {
-				return 0, err
-			}
-		case job.Status.IsDone():
-			// When a job finishes, bump the version so that idle runners — whose
-			// tasksVersion already equals the current latestVersion — learn that
-			// remaining waiting jobs are still available and attempt PickTask again.
-			// Without this bump, runners that completed their tasks would see
-			// tasksVersion==latestVersion and skip PickTask, leaving the other jobs
-			// permanently unassigned until the version changes for another reason.
-			// Only bump when waiting work actually remains for this repo, otherwise
-			// every job completion would needlessly bump the global version and wake
-			// every idle runner instance-wide for nothing.
-			hasWaiting, err := hasWaitingJobsToPick(ctx, job.RepoID)
-			if err != nil {
-				return 0, err
-			}
-			if hasWaiting {
-				if err := IncreaseTaskVersion(ctx, job.OwnerID, job.RepoID); err != nil {
-					return 0, err
-				}
-			}
+	if job.RunID == 0 {
+		var err error
+		if job, err = GetRunJobByRepoAndID(ctx, job.RepoID, job.ID); err != nil {
+			return 0, err
 		}
 	}

@@ -535,12 +500,9 @@ func AggregateJobStatus(jobs []*ActionRunJob) Status {
 	allSkipped := len(jobs) != 0
 	var hasFailure, hasCancelled, hasCancelling, hasWaiting, hasRunning, hasBlocked bool
 	for _, job := range jobs {
-		// A failed job with continue-on-error:true does not fail the workflow run.
-		// It counts as a "continued failure" and is treated like success for aggregation.
-		isContinuedFailure := job.ContinueOnError && job.Status == StatusFailure
-		allSuccessOrSkipped = allSuccessOrSkipped && (job.Status == StatusSuccess || job.Status == StatusSkipped || isContinuedFailure)
+		allSuccessOrSkipped = allSuccessOrSkipped && (job.Status == StatusSuccess || job.Status == StatusSkipped)
 		allSkipped = allSkipped && job.Status == StatusSkipped
-		hasFailure = hasFailure || (job.Status == StatusFailure && !job.ContinueOnError)
+		hasFailure = hasFailure || job.Status == StatusFailure
 		hasCancelled = hasCancelled || job.Status == StatusCancelled
 		hasCancelling = hasCancelling || job.Status == StatusCancelling
 		hasWaiting = hasWaiting || job.Status == StatusWaiting
@@ -10,7 +10,6 @@ import (
 	repo_model "gitea.dev/models/repo"
 	user_model "gitea.dev/models/user"
 	"gitea.dev/modules/container"
-	"gitea.dev/modules/optional"
 	"gitea.dev/modules/translation"
 	webhook_module "gitea.dev/modules/webhook"

@@ -62,9 +61,7 @@ type FindRunOptions struct {
 	RepoID           int64
 	OwnerID          int64
 	WorkflowID       string
-	WorkflowRepoID   int64                 // source-aware filter: the repo a run's workflow content came from (0 = any)
-	IsScopedRun      optional.Option[bool] // is the run from a scoped workflow
-	Ref              string                // the commit/tag/… that caused this workflow
+	Ref              string // the commit/tag/… that caused this workflow
 	TriggerUserID    int64
 	TriggerEvent     webhook_module.HookEventType
 	Status           []Status
@@ -80,12 +77,6 @@ func (opts FindRunOptions) ToConds() builder.Cond {
 	if opts.WorkflowID != "" {
 		cond = cond.And(builder.Eq{"`action_run`.workflow_id": opts.WorkflowID})
 	}
-	if opts.WorkflowRepoID > 0 {
-		cond = cond.And(builder.Eq{"`action_run`.workflow_repo_id": opts.WorkflowRepoID})
-	}
-	if opts.IsScopedRun.Has() {
-		cond = cond.And(builder.Eq{"`action_run`.is_scoped_run": opts.IsScopedRun.Value()})
-	}
 	if opts.TriggerUserID > 0 {
 		cond = cond.And(builder.Eq{"`action_run`.trigger_user_id": opts.TriggerUserID})
 	}
@@ -115,15 +106,6 @@ func (opts FindRunOptions) ToJoins() []db.JoinFunc {
 }

 func (opts FindRunOptions) ToOrders() string {
-	// When scoped to a repo, sort by `index`: it reuses the unique
-	// `repo_index` (repo_id, index) index, so the query seeks repo_id and
-	// walks index descending instead of filesorting all matching rows.
-	// Within a repo `index` is co-monotonic with `id`, so the order is the same.
-	if opts.RepoID > 0 {
-		return "`action_run`.`index` DESC"
-	}
-	// `index` is scoped per repo, so it is meaningless across repos. With no
-	// RepoID, sort by the global, PK-indexed `id` for a deterministic order.
 	return "`action_run`.`id` DESC"
 }

@@ -165,20 +147,9 @@ func GetRunBranches(ctx context.Context, repoID int64) ([]string, error) {
 // GetRunWorkflowIDs returns all distinct WorkflowIDs that have at least
 // one ActionRun in the given repo.
 func GetRunWorkflowIDs(ctx context.Context, repoID int64) ([]string, error) {
-	return getRunWorkflowIDs(ctx, repoID, builder.NewCond())
-}
-
-// GetRepoRunWorkflowIDs returns all distinct WorkflowIDs that have at least
-// one repo-level ActionRun in the given repo.
-func GetRepoRunWorkflowIDs(ctx context.Context, repoID int64) ([]string, error) {
-	return getRunWorkflowIDs(ctx, repoID, builder.Eq{"is_scoped_run": false})
-}
-
-func getRunWorkflowIDs(ctx context.Context, repoID int64, extraCond builder.Cond) ([]string, error) {
 	ids := make([]string, 0, 10)
-	cond := builder.Eq{"repo_id": repoID}
 	return ids, db.GetEngine(ctx).Table("action_run").
-		Where(cond.And(extraCond)).
+		Where(builder.Eq{"repo_id": repoID}).
 		Distinct("workflow_id").
 		Cols("workflow_id").
 		Asc("workflow_id").
@@ -6,13 +6,10 @@ package actions
 import (
 	"testing"

-	"gitea.dev/models/db"
 	"gitea.dev/models/unittest"
-	"gitea.dev/modules/optional"
 	"gitea.dev/modules/translation"

 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )

 func TestGetRunWorkflowIDs(t *testing.T) {
@@ -27,46 +24,6 @@ func TestGetRunWorkflowIDs(t *testing.T) {
 	assert.Empty(t, ids)
 }

-func TestGetRepoRunWorkflowIDs(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	const (
-		repoID             = int64(4)
-		repoWorkflowID     = "repo-orphan.yaml"
-		scopedWorkflowID   = "scoped-only.yaml"
-		sharedWorkflowID   = "shared-name.yaml"
-		scopedWorkflowRepo = int64(111)
-	)
-	for _, spec := range []struct {
-		id             int64
-		workflowID     string
-		workflowRepoID int64
-		isScopedRun    bool
-	}{
-		{99811, repoWorkflowID, repoID, false},
-		{99812, scopedWorkflowID, scopedWorkflowRepo, true},
-		{99813, sharedWorkflowID, repoID, false},
-		{99814, sharedWorkflowID, scopedWorkflowRepo, true},
-	} {
-		require.NoError(t, db.Insert(t.Context(), &ActionRun{
-			ID:             spec.id,
-			Index:          spec.id,
-			RepoID:         repoID,
-			OwnerID:        1,
-			TriggerUserID:  1,
-			WorkflowID:     spec.workflowID,
-			WorkflowRepoID: spec.workflowRepoID,
-			IsScopedRun:    spec.isScopedRun,
-		}))
-	}
-
-	ids, err := GetRepoRunWorkflowIDs(t.Context(), repoID)
-	require.NoError(t, err)
-	assert.Contains(t, ids, repoWorkflowID)
-	assert.Contains(t, ids, sharedWorkflowID)
-	assert.NotContains(t, ids, scopedWorkflowID)
-}
-
 func TestGetStatusInfoList(t *testing.T) {
 	statusInfoList := GetStatusInfoList(t.Context(), translation.MockLocale{})

@@ -78,85 +35,3 @@ func TestGetStatusInfoList(t *testing.T) {
 		{Status: int(StatusCancelling), StatusName: StatusCancelling.String(), DisplayedStatus: "actions.status.cancelling"},
 	}, statusInfoList)
 }
-
-// TestFindRunOptions_WorkflowRepoID: two runs share the bare WorkflowID but come from different content-source repos;
-// the source-aware WorkflowRepoID filter must separate them.
-func TestFindRunOptions_WorkflowRepoID(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	const (
-		repoID     = int64(4)
-		sourceA    = int64(111)
-		sourceB    = int64(222)
-		workflowID = "u3-shared.yaml"
-	)
-	for _, spec := range []struct{ id, workflowRepoID int64 }{
-		{99801, sourceA},
-		{99802, sourceB},
-	} {
-		require.NoError(t, db.Insert(t.Context(), &ActionRun{
-			ID:             spec.id,
-			Index:          spec.id,
-			RepoID:         repoID,
-			OwnerID:        1,
-			TriggerUserID:  1,
-			WorkflowID:     workflowID,
-			WorkflowRepoID: spec.workflowRepoID,
-			IsScopedRun:    true,
-		}))
-	}
-
-	// no source filter -> both
-	all, err := db.Find[ActionRun](t.Context(), FindRunOptions{RepoID: repoID, WorkflowID: workflowID})
-	require.NoError(t, err)
-	assert.Len(t, all, 2)
-
-	// filter by source A -> only the run whose content came from A
-	onlyA, err := db.Find[ActionRun](t.Context(), FindRunOptions{RepoID: repoID, WorkflowID: workflowID, WorkflowRepoID: sourceA})
-	require.NoError(t, err)
-	require.Len(t, onlyA, 1)
-	assert.EqualValues(t, 99801, onlyA[0].ID)
-
-	// filter by source B -> only the run whose content came from B
-	onlyB, err := db.Find[ActionRun](t.Context(), FindRunOptions{RepoID: repoID, WorkflowID: workflowID, WorkflowRepoID: sourceB})
-	require.NoError(t, err)
-	require.Len(t, onlyB, 1)
-	assert.EqualValues(t, 99802, onlyB[0].ID)
-}
-
-func TestFindRunOptions_IsScopedRun(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	const (
-		repoID     = int64(4)
-		workflowID = "scoped-flag.yaml"
-	)
-	for _, spec := range []struct {
-		id     int64
-		scoped bool
-	}{
-		{99821, false},
-		{99822, true},
-	} {
-		require.NoError(t, db.Insert(t.Context(), &ActionRun{
-			ID:             spec.id,
-			Index:          spec.id,
-			RepoID:         repoID,
-			OwnerID:        1,
-			TriggerUserID:  1,
-			WorkflowID:     workflowID,
-			WorkflowRepoID: repoID,
-			IsScopedRun:    spec.scoped,
-		}))
-	}
-
-	repoLevel, err := db.Find[ActionRun](t.Context(), FindRunOptions{RepoID: repoID, WorkflowID: workflowID, IsScopedRun: optional.Some(false)})
-	require.NoError(t, err)
-	require.Len(t, repoLevel, 1)
-	assert.EqualValues(t, 99821, repoLevel[0].ID)
-
-	scoped, err := db.Find[ActionRun](t.Context(), FindRunOptions{RepoID: repoID, WorkflowID: workflowID, IsScopedRun: optional.Some(true)})
-	require.NoError(t, err)
-	require.Len(t, scoped, 1)
-	assert.EqualValues(t, 99822, scoped[0].ID)
-}
@@ -13,7 +13,6 @@ import (
 	"gitea.dev/modules/timeutil"

 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )

 func TestUpdateRepoRunsNumbers(t *testing.T) {
@@ -45,57 +44,3 @@ func TestActionRun_Duration_NonNegative(t *testing.T) {
 	}
 	assert.Equal(t, time.Duration(0), run.Duration())
 }
-
-func TestActionRun_WorkflowLink(t *testing.T) {
-	repo := &repo_model.Repository{OwnerName: "org", Name: "consumer"}
-
-	// a repo-level run links by file name only
-	repoLevel := &ActionRun{Repo: repo, WorkflowID: "ci.yaml", WorkflowRepoID: repo.ID}
-	assert.Equal(t, repo.Link()+"/actions/?workflow=ci.yaml", repoLevel.WorkflowLink())
-
-	// a scoped run carries its source repo id back, so the list stays filtered to that source
-	scoped := &ActionRun{Repo: repo, WorkflowID: "ci.yaml", WorkflowRepoID: 42, IsScopedRun: true}
-	assert.Equal(t, repo.Link()+"/actions/?workflow=ci.yaml&scoped_workflow_source_repo_id=42", scoped.WorkflowLink())
-}
-
-func TestGetWorkflowLatestRun_RepoLevelOnly(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	const (
-		repoID     = int64(4)
-		workflowID = "badge-source-aware.yaml"
-		ref        = "refs/heads/main"
-	)
-	require.NoError(t, db.Insert(t.Context(), &ActionRun{
-		ID:                99811,
-		Index:             99811,
-		RepoID:            repoID,
-		OwnerID:           1,
-		TriggerUserID:     1,
-		WorkflowID:        workflowID,
-		Ref:               ref,
-		Event:             "push",
-		Status:            StatusSuccess,
-		WorkflowRepoID:    repoID,
-		WorkflowCommitSHA: "repo-level-sha",
-	}))
-	require.NoError(t, db.Insert(t.Context(), &ActionRun{
-		ID:                99812,
-		Index:             99812,
-		RepoID:            repoID,
-		OwnerID:           1,
-		TriggerUserID:     1,
-		WorkflowID:        workflowID,
-		Ref:               ref,
-		Event:             "push",
-		Status:            StatusFailure,
-		WorkflowRepoID:    111,
-		WorkflowCommitSHA: "scoped-sha",
-		IsScopedRun:       true,
-	}))
-
-	run, err := GetWorkflowLatestRun(t.Context(), repoID, workflowID, ref, "push")
-	require.NoError(t, err)
-	assert.EqualValues(t, 99811, run.ID)
-	assert.False(t, run.IsScopedRun)
-}
@@ -1,179 +0,0 @@
-// Copyright 2026 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package actions
-
-import (
-	"context"
-	"fmt"
-
-	"gitea.dev/models/db"
-	repo_model "gitea.dev/models/repo"
-	"gitea.dev/modules/timeutil"
-	"gitea.dev/modules/util"
-
-	"xorm.io/builder"
-)
-
-// ActionScopedWorkflowSource registers a repository as a source of scoped workflows, either for an owner (user/org) or for the whole instance.
-type ActionScopedWorkflowSource struct {
-	ID int64 `xorm:"pk autoincr"`
-
-	// OwnerID is the scope the source applies to: a user/org ID (applies to that owner's repos), or 0 for instance-level (applies to every repo).
-	OwnerID int64 `xorm:"UNIQUE(owner_repo) NOT NULL DEFAULT 0"`
-	// SourceRepoID is the source repository providing the workflow files; always non-zero.
-	SourceRepoID int64 `xorm:"INDEX UNIQUE(owner_repo) NOT NULL DEFAULT 0"`
-
-	// WorkflowConfigs maps a workflow ID (entry name) to its merge-gate config.
-	WorkflowConfigs map[string]*ScopedWorkflowConfig `xorm:"JSON TEXT 'workflow_configs'"`
-
-	CreatedUnix timeutil.TimeStamp `xorm:"created"`
-	UpdatedUnix timeutil.TimeStamp `xorm:"updated"`
-}
-
-// ScopedWorkflowConfig is one scoped workflow's config within a source registration.
-type ScopedWorkflowConfig struct {
-	Required bool     `json:"required"`
-	Patterns []string `json:"patterns"` // the status-check patterns that must be present and pass, only effective when Required is true
-}
-
-func init() {
-	db.RegisterModel(new(ActionScopedWorkflowSource))
-}
-
-// IsWorkflowRequired reports whether the given workflow ID (entry name) is marked required in this source.
-func (s *ActionScopedWorkflowSource) IsWorkflowRequired(workflowID string) bool {
-	c, ok := s.WorkflowConfigs[workflowID]
-	return ok && c.Required
-}
-
-type FindScopedWorkflowSourceOpts struct {
-	db.ListOptions
-	OwnerIDs     []int64
-	SourceRepoID int64
-}
-
-func (opts FindScopedWorkflowSourceOpts) ToConds() builder.Cond {
-	cond := builder.NewCond()
-	if len(opts.OwnerIDs) > 0 {
-		cond = cond.And(builder.In("owner_id", opts.OwnerIDs))
-	}
-	if opts.SourceRepoID != 0 {
-		cond = cond.And(builder.Eq{"source_repo_id": opts.SourceRepoID})
-	}
-	return cond
-}
-
-// GetEffectiveScopedWorkflowSources returns the scoped-workflow sources effective for a repo owned by repoOwnerID:
-// the owner's own sources plus instance-level (owner_id=0) sources.
-func GetEffectiveScopedWorkflowSources(ctx context.Context, repoOwnerID int64) ([]*ActionScopedWorkflowSource, error) {
-	owners := []int64{0}
-	if repoOwnerID != 0 {
-		owners = append(owners, repoOwnerID)
-	}
-	return db.Find[ActionScopedWorkflowSource](ctx, FindScopedWorkflowSourceOpts{OwnerIDs: owners})
-}
-
-// IsScopedWorkflowSourceEffective reports whether sourceRepoID is a scoped-workflow source effective for a repo owned by repoOwnerID.
-func IsScopedWorkflowSourceEffective(ctx context.Context, repoOwnerID, sourceRepoID int64) (bool, error) {
-	owners := []int64{0}
-	if repoOwnerID != 0 {
-		owners = append(owners, repoOwnerID)
-	}
-	return db.Exist[ActionScopedWorkflowSource](ctx, FindScopedWorkflowSourceOpts{OwnerIDs: owners, SourceRepoID: sourceRepoID}.ToConds())
-}
-
-// IsWorkflowRequiredInSources reports whether workflowID from sourceRepoID is required by any of the given sources.
-func IsWorkflowRequiredInSources(sources []*ActionScopedWorkflowSource, sourceRepoID int64, workflowID string) bool {
-	for _, s := range sources {
-		if s.SourceRepoID == sourceRepoID && s.IsWorkflowRequired(workflowID) {
-			return true
-		}
-	}
-	return false
-}
-
-// ScopedStatusContextPrefix returns the source-repo prefix that makes a scoped run's commit-status context distinct from same-named workflows.
-func ScopedStatusContextPrefix(ctx context.Context, sourceRepoID int64) string {
-	if sourceRepo, err := repo_model.GetRepositoryByID(ctx, sourceRepoID); err == nil {
-		return sourceRepo.FullName()
-	}
-	return fmt.Sprintf("scoped:%d", sourceRepoID)
-}
-
-// IsScopedWorkflowRequired reports whether workflowID from sourceRepoID is required for a repo owned by consumerOwnerID.
-func IsScopedWorkflowRequired(ctx context.Context, consumerOwnerID, sourceRepoID int64, workflowID string) (bool, error) {
-	sources, err := GetEffectiveScopedWorkflowSources(ctx, consumerOwnerID)
-	if err != nil {
-		return false, err
-	}
-	return IsWorkflowRequiredInSources(sources, sourceRepoID, workflowID), nil
-}
-
-// IsScopedWorkflowOptedOutloads the consumer's effective sources then calls ScopedWorkflowOptedOut
-func IsScopedWorkflowOptedOut(ctx context.Context, cfg *repo_model.ActionsConfig, consumerOwnerID, sourceRepoID int64, workflowID string) (bool, error) {
-	if !cfg.IsScopedWorkflowDisabled(sourceRepoID, workflowID) {
-		return false, nil
-	}
-	sources, err := GetEffectiveScopedWorkflowSources(ctx, consumerOwnerID)
-	if err != nil {
-		return false, err
-	}
-	return ScopedWorkflowOptedOut(cfg, sources, sourceRepoID, workflowID), nil
-}
-
-// ScopedWorkflowOptedOut reports whether a consumer's opt-out of (sourceRepoID, workflowID) is in effect.
-func ScopedWorkflowOptedOut(cfg *repo_model.ActionsConfig, sources []*ActionScopedWorkflowSource, sourceRepoID int64, workflowID string) bool {
-	return !IsWorkflowRequiredInSources(sources, sourceRepoID, workflowID) && cfg.IsScopedWorkflowDisabled(sourceRepoID, workflowID)
-}
-
-// GetScopedWorkflowSourcesByOwner returns the sources an owner (user/org, or 0 for instance) registered.
-func GetScopedWorkflowSourcesByOwner(ctx context.Context, ownerID int64) ([]*ActionScopedWorkflowSource, error) {
-	return db.Find[ActionScopedWorkflowSource](ctx, FindScopedWorkflowSourceOpts{OwnerIDs: []int64{ownerID}})
-}
-
-// GetScopedWorkflowSource returns the (owner, repo) source registration or a NotExist error.
-func GetScopedWorkflowSource(ctx context.Context, ownerID, repoID int64) (*ActionScopedWorkflowSource, error) {
-	src := &ActionScopedWorkflowSource{}
-	has, err := db.GetEngine(ctx).Where("owner_id = ? AND source_repo_id = ?", ownerID, repoID).Get(src)
-	if err != nil {
-		return nil, err
-	}
-	if !has {
-		return nil, util.NewNotExistErrorf("scoped workflow source (owner %d, repo %d) does not exist", ownerID, repoID)
-	}
-	return src, nil
-}
-
-// AddScopedWorkflowSource registers repoID as a source for ownerID (no-op if already registered).
-func AddScopedWorkflowSource(ctx context.Context, ownerID, repoID int64) error {
-	exists, err := db.GetEngine(ctx).Where("owner_id = ? AND source_repo_id = ?", ownerID, repoID).Exist(new(ActionScopedWorkflowSource))
-	if err != nil {
-		return err
-	}
-	if exists {
-		return nil
-	}
-	if err := db.Insert(ctx, &ActionScopedWorkflowSource{OwnerID: ownerID, SourceRepoID: repoID}); err != nil {
-		// Re-check and treat an already-present row as the intended no-op.
-		if exists, existErr := db.GetEngine(ctx).Where("owner_id = ? AND source_repo_id = ?", ownerID, repoID).Exist(new(ActionScopedWorkflowSource)); existErr == nil && exists {
-			return nil
-		}
-		return err
-	}
-	return nil
-}
-
-// SetScopedWorkflowSourceConfigs replaces the per-workflow merge-gate configs (workflow ID -> config).
-func SetScopedWorkflowSourceConfigs(ctx context.Context, ownerID, repoID int64, configs map[string]*ScopedWorkflowConfig) error {
-	_, err := db.GetEngine(ctx).Where("owner_id = ? AND source_repo_id = ?", ownerID, repoID).
-		Cols("workflow_configs").
-		Update(&ActionScopedWorkflowSource{WorkflowConfigs: configs})
-	return err
-}
-
-// RemoveScopedWorkflowSource removes the (owner, repo) source registration.
-func RemoveScopedWorkflowSource(ctx context.Context, ownerID, repoID int64) error {
-	_, err := db.GetEngine(ctx).Where("owner_id = ? AND source_repo_id = ?", ownerID, repoID).Delete(new(ActionScopedWorkflowSource))
-	return err
-}
@@ -1,139 +0,0 @@
-// Copyright 2026 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package actions
-
-import (
-	"testing"
-
-	"gitea.dev/models/db"
-	"gitea.dev/models/unittest"
-	"gitea.dev/modules/util"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestScopedWorkflowSource_IsWorkflowRequired(t *testing.T) {
-	src := &ActionScopedWorkflowSource{WorkflowConfigs: map[string]*ScopedWorkflowConfig{
-		"a.yml": {Required: true, Patterns: []string{"p"}},
-		"b.yml": {Required: true, Patterns: []string{"p"}},
-		"c.yml": {Required: false, Patterns: []string{"p"}}, // patterns kept as history, not required
-	}}
-	assert.True(t, src.IsWorkflowRequired("a.yml"))
-	assert.True(t, src.IsWorkflowRequired("b.yml"))
-	assert.False(t, src.IsWorkflowRequired("c.yml"), "config kept as history but not required")
-	assert.False(t, src.IsWorkflowRequired("d.yml"))
-
-	empty := &ActionScopedWorkflowSource{}
-	assert.False(t, empty.IsWorkflowRequired("a.yml"))
-}
-
-func TestIsWorkflowRequiredInSources(t *testing.T) {
-	// repo 100 registered twice (org optional + instance required).
-	sources := []*ActionScopedWorkflowSource{
-		{OwnerID: 2, SourceRepoID: 100, WorkflowConfigs: nil},
-		{OwnerID: 0, SourceRepoID: 100, WorkflowConfigs: map[string]*ScopedWorkflowConfig{"a.yml": {Required: true, Patterns: []string{"p"}}}},
-		{OwnerID: 0, SourceRepoID: 200, WorkflowConfigs: map[string]*ScopedWorkflowConfig{"b.yml": {Required: true, Patterns: []string{"p"}}}},
-	}
-
-	assert.True(t, IsWorkflowRequiredInSources(sources, 100, "a.yml"), "required at instance level wins over org optional")
-	assert.False(t, IsWorkflowRequiredInSources(sources, 100, "z.yml"))
-	assert.False(t, IsWorkflowRequiredInSources(sources, 200, "a.yml"), "a.yml is required for repo 100, not repo 200")
-	assert.True(t, IsWorkflowRequiredInSources(sources, 200, "b.yml"))
-	assert.False(t, IsWorkflowRequiredInSources(sources, 999, "a.yml"), "unknown source repo")
-}
-
-func TestGetEffectiveScopedWorkflowSources(t *testing.T) {
-	require.NoError(t, unittest.PrepareTestDatabase())
-	ctx := t.Context()
-
-	rows := []*ActionScopedWorkflowSource{
-		{OwnerID: 2, SourceRepoID: 100, WorkflowConfigs: nil}, // org 2 registers repo 100 (optional)
-		{OwnerID: 0, SourceRepoID: 100, WorkflowConfigs: map[string]*ScopedWorkflowConfig{"a.yml": {Required: true, Patterns: []string{"p"}}}}, // instance also registers repo 100 (required)
-		{OwnerID: 0, SourceRepoID: 200, WorkflowConfigs: map[string]*ScopedWorkflowConfig{"b.yml": {Required: true, Patterns: []string{"p"}}}}, // instance source 200
-		{OwnerID: 3, SourceRepoID: 300, WorkflowConfigs: map[string]*ScopedWorkflowConfig{"c.yml": {Required: true, Patterns: []string{"p"}}}}, // a different owner's source
-	}
-	for _, r := range rows {
-		require.NoError(t, db.Insert(ctx, r))
-	}
-
-	// owner 2 sees its own sources plus instance-level ones, but not owner 3's.
-	owner2, err := GetEffectiveScopedWorkflowSources(ctx, 2)
-	require.NoError(t, err)
-	assert.Len(t, owner2, 3)
-
-	required, err := IsScopedWorkflowRequired(ctx, 2, 100, "a.yml")
-	require.NoError(t, err)
-	assert.True(t, required, "instance marks a.yml required → required for owner 2 even though org left it optional")
-
-	required, err = IsScopedWorkflowRequired(ctx, 2, 100, "x.yml")
-	require.NoError(t, err)
-	assert.False(t, required)
-
-	required, err = IsScopedWorkflowRequired(ctx, 2, 200, "b.yml")
-	require.NoError(t, err)
-	assert.True(t, required)
-
-	// owner 3's source must not be effective for owner 2.
-	required, err = IsScopedWorkflowRequired(ctx, 2, 300, "c.yml")
-	require.NoError(t, err)
-	assert.False(t, required)
-
-	// IsScopedWorkflowSourceEffective: owner-level and instance-level sources are effective; another owner's is not.
-	effective, err := IsScopedWorkflowSourceEffective(ctx, 2, 100)
-	require.NoError(t, err)
-	assert.True(t, effective, "owner 2's own source")
-
-	effective, err = IsScopedWorkflowSourceEffective(ctx, 2, 200)
-	require.NoError(t, err)
-	assert.True(t, effective, "instance-level source is effective for any owner")
-
-	effective, err = IsScopedWorkflowSourceEffective(ctx, 2, 300)
-	require.NoError(t, err)
-	assert.False(t, effective, "owner 3's source is not effective for owner 2")
-
-	effective, err = IsScopedWorkflowSourceEffective(ctx, 2, 999)
-	require.NoError(t, err)
-	assert.False(t, effective, "unknown source repo")
-
-	effective, err = IsScopedWorkflowSourceEffective(ctx, 3, 300)
-	require.NoError(t, err)
-	assert.True(t, effective, "owner 3's own source is effective for owner 3")
-}
-
-func TestScopedWorkflowSourceCRUD(t *testing.T) {
-	require.NoError(t, unittest.PrepareTestDatabase())
-	ctx := t.Context()
-
-	// add is idempotent
-	require.NoError(t, AddScopedWorkflowSource(ctx, 5, 10))
-	require.NoError(t, AddScopedWorkflowSource(ctx, 5, 10))
-	sources, err := GetScopedWorkflowSourcesByOwner(ctx, 5)
-	require.NoError(t, err)
-	assert.Len(t, sources, 1)
-
-	// set the per-workflow configs (entry name -> {required, patterns}); a.yml required, b.yml kept as history (not required)
-	configs := map[string]*ScopedWorkflowConfig{
-		"a.yml": {Required: true, Patterns: []string{"src: a.yml / *"}},
-		"b.yml": {Required: false, Patterns: []string{"src: b.yml / build (push)"}},
-	}
-	require.NoError(t, SetScopedWorkflowSourceConfigs(ctx, 5, 10, configs))
-	src, err := GetScopedWorkflowSource(ctx, 5, 10)
-	require.NoError(t, err)
-	assert.Equal(t, configs, src.WorkflowConfigs)
-
-	// clearing the configs works
-	require.NoError(t, SetScopedWorkflowSourceConfigs(ctx, 5, 10, nil))
-	src, err = GetScopedWorkflowSource(ctx, 5, 10)
-	require.NoError(t, err)
-	assert.Empty(t, src.WorkflowConfigs)
-
-	// remove
-	require.NoError(t, RemoveScopedWorkflowSource(ctx, 5, 10))
-	_, err = GetScopedWorkflowSource(ctx, 5, 10)
-	assert.ErrorIs(t, err, util.ErrNotExist)
-	sources, err = GetScopedWorkflowSourcesByOwner(ctx, 5)
-	require.NoError(t, err)
-	assert.Empty(t, sources)
-}
@@ -48,57 +48,3 @@ func TestStatusFromResult(t *testing.T) {
 		assert.Equal(t, tt.want, StatusFromResult(tt.result), "result=%s", tt.result)
 	}
 }
-
-func newJob(status Status, continueOnError bool) *ActionRunJob {
-	return &ActionRunJob{Status: status, ContinueOnError: continueOnError}
-}
-
-func TestAggregateJobStatusContinueOnError(t *testing.T) {
-	cases := []struct {
-		name string
-		jobs []*ActionRunJob
-		want Status
-	}{
-		{
-			name: "all success",
-			jobs: []*ActionRunJob{newJob(StatusSuccess, false), newJob(StatusSuccess, false)},
-			want: StatusSuccess,
-		},
-		{
-			name: "one failure without continue-on-error",
-			jobs: []*ActionRunJob{newJob(StatusSuccess, false), newJob(StatusFailure, false)},
-			want: StatusFailure,
-		},
-		{
-			name: "one failure with continue-on-error",
-			jobs: []*ActionRunJob{newJob(StatusSuccess, false), newJob(StatusFailure, true)},
-			want: StatusSuccess,
-		},
-		{
-			name: "only continued-failure",
-			jobs: []*ActionRunJob{newJob(StatusFailure, true)},
-			want: StatusSuccess,
-		},
-		{
-			name: "continued-failure plus real failure",
-			jobs: []*ActionRunJob{newJob(StatusFailure, true), newJob(StatusFailure, false)},
-			want: StatusFailure,
-		},
-		{
-			name: "all skipped",
-			jobs: []*ActionRunJob{newJob(StatusSkipped, false), newJob(StatusSkipped, false)},
-			want: StatusSkipped,
-		},
-		{
-			name: "continued-failure plus skipped counts as success",
-			jobs: []*ActionRunJob{newJob(StatusFailure, true), newJob(StatusSkipped, false)},
-			want: StatusSuccess,
-		},
-	}
-
-	for _, tt := range cases {
-		t.Run(tt.name, func(t *testing.T) {
-			assert.Equal(t, tt.want, AggregateJobStatus(tt.jobs))
-		})
-	}
-}
@@ -227,18 +227,13 @@ func makeTaskStepDisplayName(step *jobparser.Step, limit int) (name string) {
 	return util.EllipsisDisplayString(name, limit) // database column has a length limit
 }

-// errJobAlreadyClaimed is a sentinel used inside claimJobForRunner to signal that
-// another runner won the optimistic-lock race; it is never returned to callers.
-var errJobAlreadyClaimed = errors.New("job already claimed by another runner")
-
-// CreateTaskForRunner finds a waiting job that matches the runner's labels and
-// atomically claims it. It iterates through all matching jobs so that a
-// concurrent claim by another runner (which would lose the optimistic lock on
-// job #1) does not leave the remaining jobs permanently unassigned.
 func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask, bool, error) {
-	if db.InTransaction(ctx) {
-		return nil, false, errors.New("CreateTaskForRunner must not be called within a database transaction")
+	ctx, committer, err := db.TxContext(ctx)
+	if err != nil {
+		return nil, false, err
 	}
+	defer committer.Close()
+
 	e := db.GetEngine(ctx)

 	jobCond := builder.NewCond()
@@ -259,144 +254,83 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask
 	}

 	// TODO: a more efficient way to filter labels
+	var job *ActionRunJob
 	log.Trace("runner labels: %v", runner.AgentLabels)
 	for _, v := range jobs {
-		if !runner.CanMatchLabels(v.RunsOn) {
-			continue
+		if runner.CanMatchLabels(v.RunsOn) {
+			job = v
+			break
 		}
-		task, ok, err := claimJobForRunner(ctx, runner, v)
-		if err != nil {
-			return nil, false, err
-		}
-		if ok {
-			return task, true, nil
-		}
-		// Another runner claimed this job concurrently; try the next one.
 	}
-	return nil, false, nil
-}
-
-// claimJobForRunner attempts to atomically claim job for runner inside its own
-// transaction. Returns (task, true, nil) on success, or (nil, false, nil) when
-// another runner wins the optimistic-lock race (the caller should try the next
-// candidate job).
-func claimJobForRunner(ctx context.Context, runner *ActionRunner, job *ActionRunJob) (*ActionTask, bool, error) {
-	var resultTask *ActionTask
-
-	err := db.WithTx(ctx, func(ctx context.Context) error {
-		e := db.GetEngine(ctx)
-
-		if err := job.LoadAttributes(ctx); err != nil {
-			return err
-		}
-
-		now := timeutil.TimeStampNow()
-		job.Started = now
-		job.Status = StatusRunning
-
-		task := &ActionTask{
-			JobID:             job.ID,
-			Attempt:           job.Attempt,
-			RunnerID:          runner.ID,
-			Started:           now,
-			Status:            StatusRunning,
-			RepoID:            job.RepoID,
-			OwnerID:           job.OwnerID,
-			CommitSHA:         job.CommitSHA,
-			IsForkPullRequest: job.IsForkPullRequest,
-		}
-		task.GenerateAndFillToken()
-
-		workflowJob, err := job.ParseJob()
-		if err != nil {
-			return fmt.Errorf("load job %d: %w", job.ID, err)
-		}
-
-		if _, err := e.Insert(task); err != nil {
-			return err
-		}
-
-		task.LogFilename = logFileName(job.Run.Repo.FullName(), task.ID)
-		if err := UpdateTask(ctx, task, "log_filename"); err != nil {
-			return err
-		}
-
-		if len(workflowJob.Steps) > 0 {
-			steps := make([]*ActionTaskStep, len(workflowJob.Steps))
-			for i, v := range workflowJob.Steps {
-				steps[i] = &ActionTaskStep{
-					Name:   makeTaskStepDisplayName(v, 255),
-					TaskID: task.ID,
-					Index:  int64(i),
-					RepoID: task.RepoID,
-					Status: StatusWaiting,
-				}
-			}
-			if _, err := e.Insert(steps); err != nil {
-				return err
-			}
-			task.Steps = steps
-		}
-
-		job.TaskID = task.ID
-		n, err := UpdateRunJob(ctx, job, builder.And(builder.Eq{"task_id": 0}, builder.Eq{"status": StatusWaiting}))
-		if err != nil {
-			return err
-		}
-		if n != 1 {
-			// Another runner claimed this job between our scan and this update;
-			// signal the outer loop to move on without treating this as an error.
-			return errJobAlreadyClaimed
-		}
-
-		task.Job = job
-		resultTask = task
-		return nil
-	})
-
-	if errors.Is(err, errJobAlreadyClaimed) {
+	if job == nil {
 		return nil, false, nil
 	}
-	if err != nil {
+	if err := job.LoadAttributes(ctx); err != nil {
 		return nil, false, err
 	}
-	return resultTask, true, nil
-}

-// ReleaseTaskForRunner reverts a freshly-claimed but undelivered task: it deletes
-// the task together with its steps and returns the job to the waiting queue. It is
-// used when assembling the runner response fails after the job was already claimed,
-// so the job is not stranded in running state with no runner ever executing it.
-func ReleaseTaskForRunner(ctx context.Context, task *ActionTask) error {
-	return db.WithTx(ctx, func(ctx context.Context) error {
-		e := db.GetEngine(ctx)
+	now := timeutil.TimeStampNow()
+	job.Started = now
+	job.Status = StatusRunning

-		job, err := GetRunJobByRepoAndID(ctx, task.RepoID, task.JobID)
-		if err != nil {
-			return err
-		}
+	task := &ActionTask{
+		JobID:             job.ID,
+		Attempt:           job.Attempt,
+		RunnerID:          runner.ID,
+		Started:           now,
+		Status:            StatusRunning,
+		RepoID:            job.RepoID,
+		OwnerID:           job.OwnerID,
+		CommitSHA:         job.CommitSHA,
+		IsForkPullRequest: job.IsForkPullRequest,
+	}
+	task.GenerateAndFillToken()

-		job.Status = StatusWaiting
-		job.Started = 0
-		job.TaskID = 0
-		// Guard on task_id and status so we only release while the job still
-		// references this task and has not progressed past running.
-		n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": task.ID, "status": StatusRunning}, "status", "started", "task_id")
-		if err != nil {
-			return err
-		}
-		if n != 1 {
-			return fmt.Errorf("release task %d: job %d no longer references it", task.ID, task.JobID)
-		}
+	workflowJob, err := job.ParseJob()
+	if err != nil {
+		return nil, false, fmt.Errorf("load job %d: %w", job.ID, err)
+	}

-		if _, err := e.Delete(&ActionTaskStep{TaskID: task.ID}); err != nil {
-			return err
+	if _, err := e.Insert(task); err != nil {
+		return nil, false, err
+	}
+
+	task.LogFilename = logFileName(job.Run.Repo.FullName(), task.ID)
+	if err := UpdateTask(ctx, task, "log_filename"); err != nil {
+		return nil, false, err
+	}
+
+	if len(workflowJob.Steps) > 0 {
+		steps := make([]*ActionTaskStep, len(workflowJob.Steps))
+		for i, v := range workflowJob.Steps {
+			steps[i] = &ActionTaskStep{
+				Name:   makeTaskStepDisplayName(v, 255),
+				TaskID: task.ID,
+				Index:  int64(i),
+				RepoID: task.RepoID,
+				Status: StatusWaiting,
+			}
 		}
-		if _, err := e.ID(task.ID).Delete(&ActionTask{}); err != nil {
-			return err
+		if _, err := e.Insert(steps); err != nil {
+			return nil, false, err
 		}
-		return nil
-	})
+		task.Steps = steps
+	}
+
+	job.TaskID = task.ID
+	if n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}); err != nil {
+		return nil, false, err
+	} else if n != 1 {
+		return nil, false, nil
+	}
+
+	task.Job = job
+
+	if err := committer.Commit(); err != nil {
+		return nil, false, err
+	}
+
+	return task, true, nil
 }

 func UpdateTask(ctx context.Context, task *ActionTask, cols ...string) error {
@@ -306,68 +306,3 @@ func TestStopTaskCancellingFallsBackForMissingRunner(t *testing.T) {
 	assert.Equal(t, StatusCancelled, jobAfterStop.Status)
 	assert.NotZero(t, jobAfterStop.Stopped)
 }
-
-// TestReleaseTaskForRunner verifies that releasing a freshly-claimed task returns
-// its job to the waiting queue and deletes the task and its steps, so a failure
-// while assembling the runner response cannot strand the job in running state.
-func TestReleaseTaskForRunner(t *testing.T) {
-	require.NoError(t, unittest.PrepareTestDatabase())
-
-	run := &ActionRun{
-		Title:         "release-task-test-run",
-		RepoID:        1,
-		OwnerID:       2,
-		WorkflowID:    "test.yaml",
-		Index:         9902,
-		TriggerUserID: 2,
-		Ref:           "refs/heads/main",
-		CommitSHA:     "c2d72f548424103f01ee1dc02889c1e2bff816b0",
-		Event:         "push",
-		TriggerEvent:  "push",
-		Status:        StatusWaiting,
-	}
-	require.NoError(t, db.Insert(t.Context(), run))
-
-	job := &ActionRunJob{
-		RunID:           run.ID,
-		RepoID:          run.RepoID,
-		OwnerID:         run.OwnerID,
-		CommitSHA:       run.CommitSHA,
-		Name:            "release-job",
-		Attempt:         1,
-		JobID:           "release-job",
-		Status:          StatusWaiting,
-		RunsOn:          []string{"ubuntu-latest"},
-		WorkflowPayload: []byte("on: push\njobs:\n  release-job:\n    runs-on: ubuntu-latest\n    steps:\n      - run: echo hi\n"),
-	}
-	require.NoError(t, db.Insert(t.Context(), job))
-
-	runner := &ActionRunner{
-		UUID:        "release-runner-uuid",
-		Name:        "release-runner",
-		AgentLabels: []string{"ubuntu-latest"},
-	}
-	runner.GenerateAndFillToken()
-	require.NoError(t, db.Insert(t.Context(), runner))
-
-	task, ok, err := CreateTaskForRunner(t.Context(), runner)
-	require.NoError(t, err)
-	require.True(t, ok)
-	require.NotNil(t, task)
-
-	claimed := unittest.AssertExistsAndLoadBean(t, &ActionRunJob{ID: job.ID})
-	require.Equal(t, StatusRunning, claimed.Status)
-	require.Equal(t, task.ID, claimed.TaskID)
-
-	require.NoError(t, ReleaseTaskForRunner(t.Context(), task))
-
-	// Job is back in the waiting queue with no task assigned.
-	released := unittest.AssertExistsAndLoadBean(t, &ActionRunJob{ID: job.ID})
-	assert.Equal(t, StatusWaiting, released.Status)
-	assert.Zero(t, released.TaskID)
-	assert.Zero(t, released.Started)
-
-	// The task and its steps are gone.
-	unittest.AssertNotExistsBean(t, &ActionTask{ID: task.ID})
-	unittest.AssertNotExistsBean(t, &ActionTaskStep{TaskID: task.ID})
-}
@@ -18,8 +18,6 @@ import (
 	"gitea.dev/modules/structs"
 	"gitea.dev/modules/timeutil"
 	"gitea.dev/modules/util"
-
-	"xorm.io/builder"
 )

 // Task represents a task
@@ -174,13 +172,17 @@ func (err ErrTaskDoesNotExist) Unwrap() error {

 // GetMigratingTask returns the migrating task by repo's id
 func GetMigratingTask(ctx context.Context, repoID int64) (*Task, error) {
-	task, has, err := db.Get[Task](ctx, builder.Eq{"repo_id": repoID, "`type`": structs.TaskTypeMigrateRepo})
+	task := Task{
+		RepoID: repoID,
+		Type:   structs.TaskTypeMigrateRepo,
+	}
+	has, err := db.GetEngine(ctx).Get(&task)
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrTaskDoesNotExist{0, repoID, structs.TaskTypeMigrateRepo}
+		return nil, ErrTaskDoesNotExist{0, repoID, task.Type}
 	}
-	return task, nil
+	return &task, nil
 }

 // CreateTask creates a task on database
@@ -120,6 +120,17 @@ func (err ErrGPGInvalidTokenSignature) Error() string {
 	return "the provided signature does not sign the token with the provided key"
 }

+type ErrGPGLastKey struct{}
+
+func (e ErrGPGLastKey) Error() string {
+	return "cannot delete last GPG key"
+}
+
+func IsErrGPGLastKey(err error) bool {
+	_, ok := err.(ErrGPGLastKey)
+	return ok
+}
+
 // ErrGPGKeyParsing represents a "ErrGPGKeyParsing" kind of error.
 type ErrGPGKeyParsing struct {
 	ParseError error
@@ -228,12 +228,49 @@ func DeleteGPGKey(ctx context.Context, doer *user_model.User, id int64) (err err
 		return fmt.Errorf("GetPublicKeyByID: %w", err)
 	}

+	count, err := db.GetEngine(ctx).Where("owner_id = ?", doer.ID).Count(new(GPGKey))
+	if err != nil {
+		return err
+	}
+	if count <= 1 {
+		return ErrGPGLastKey{}
+	}
+
 	return db.WithTx(ctx, func(ctx context.Context) error {
 		_, err = deleteGPGKey(ctx, key.KeyID)
 		return err
 	})
 }

+// ExtractGPGKeyIdentity returns the primary name and email from the first UID of an armored key
+func ExtractGPGKeyIdentity(armoredKey string) (name, email string, err error) {
+	keys, err := CheckArmoredGPGKeyString(armoredKey)
+	if err != nil {
+		return "", "", err
+	}
+	if len(keys) == 0 {
+		return "", "", errors.New("no keys found")
+	}
+	for _, uid := range keys[0].Identities {
+		if uid.UserId != nil {
+			return uid.UserId.Name, uid.UserId.Email, nil
+		}
+	}
+	return "", "", errors.New("no identity found in key")
+}
+
+// ExtractGPGKeyID returns the key ID string from an armored key
+func ExtractGPGKeyID(armoredKey string) (string, error) {
+	keys, err := CheckArmoredGPGKeyString(armoredKey)
+	if err != nil {
+		return "", err
+	}
+	if len(keys) == 0 {
+		return "", errors.New("no keys found")
+	}
+	return fmt.Sprintf("%016X", keys[0].PrimaryKey.KeyId), nil
+}
+
 func FindGPGKeyWithSubKeys(ctx context.Context, keyID string) ([]*GPGKey, error) {
 	return db.Find[GPGKey](ctx, FindGPGKeyOptions{
 		KeyID:          keyID,
@@ -5,7 +5,6 @@ package asymkey

 import (
 	"context"
-	"strings"

 	"gitea.dev/models/db"
 	"gitea.dev/modules/log"
@@ -78,15 +77,9 @@ func AddGPGKey(ctx context.Context, ownerID int64, content, token, signature str
 		verified := false
 		// Handle provided signature
 		if signature != "" {
-			signer, err := openpgp.CheckArmoredDetachedSignature(ekeys, strings.NewReader(token), strings.NewReader(signature), nil)
+			signer, err := checkSignatureWithClearsign(ekeys, token, signature)
 			if err != nil {
-				signer, err = openpgp.CheckArmoredDetachedSignature(ekeys, strings.NewReader(token+"\n"), strings.NewReader(signature), nil)
-			}
-			if err != nil {
-				signer, err = openpgp.CheckArmoredDetachedSignature(ekeys, strings.NewReader(token+"\r\n"), strings.NewReader(signature), nil)
-			}
-			if err != nil {
-				log.Debug("AddGPGKey CheckArmoredDetachedSignature failed: %v", err)
+				log.Debug("AddGPGKey checkSignatureWithClearsign failed: %v", err)
 				return nil, ErrGPGInvalidTokenSignature{
 					ID:      ekeys[0].PrimaryKey.KeyIdString(),
 					Wrapped: err,
@@ -16,6 +16,7 @@ import (

 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/armor"
+	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
 	"github.com/ProtonMail/go-crypto/openpgp/packet"
 )

@@ -121,21 +122,89 @@ func readArmoredSign(r io.Reader) (body io.Reader, err error) {
 }

 func ExtractSignature(s string) (*packet.Signature, error) {
+	s = strings.TrimSpace(s)
+
+	if strings.HasPrefix(s, "-----BEGIN PGP SIGNED MESSAGE-----") {
+		block, _ := clearsign.Decode([]byte(s))
+		if block == nil {
+			return nil, errors.New("failed to decode clearsign block")
+		}
+		p, err := packet.Read(block.ArmoredSignature.Body)
+		if err != nil {
+			return nil, errors.New("failed to read signature packet from clearsign")
+		}
+		sig, ok := p.(*packet.Signature)
+		if !ok {
+			return nil, errors.New("packet is not a signature")
+		}
+		return sig, nil
+	}
+
 	r, err := readArmoredSign(strings.NewReader(s))
 	if err != nil {
-		return nil, errors.New("Failed to read signature armor")
+		return nil, errors.New("failed to read signature armor")
 	}
 	p, err := packet.Read(r)
 	if err != nil {
-		return nil, errors.New("Failed to read signature packet")
+		return nil, errors.New("failed to read signature packet")
 	}
 	sig, ok := p.(*packet.Signature)
 	if !ok {
-		return nil, errors.New("Packet is not a signature")
+		return nil, errors.New("packet is not a signature")
 	}
 	return sig, nil
 }

+func extractSignatureAndPayload(signature string) (*packet.Signature, string, error) {
+	s := strings.TrimSpace(signature)
+
+	if strings.HasPrefix(s, "-----BEGIN PGP SIGNED MESSAGE-----") {
+		block, _ := clearsign.Decode([]byte(s))
+		if block == nil {
+			return nil, "", errors.New("failed to decode clearsign block")
+		}
+		p, err := packet.Read(block.ArmoredSignature.Body)
+		if err != nil {
+			return nil, "", errors.New("failed to read signature packet from clearsign")
+		}
+		sig, ok := p.(*packet.Signature)
+		if !ok {
+			return nil, "", errors.New("packet is not a signature")
+		}
+		return sig, string(block.Bytes), nil
+	}
+
+	sig, err := ExtractSignature(s)
+	if err != nil {
+		return nil, "", err
+	}
+	return sig, "", nil
+}
+
+func checkSignatureWithClearsign(ekeys openpgp.EntityList, token, signature string) (*openpgp.Entity, error) {
+	s := strings.TrimSpace(signature)
+
+	if strings.HasPrefix(s, "-----BEGIN PGP SIGNED MESSAGE-----") {
+		block, _ := clearsign.Decode([]byte(s))
+		if block == nil {
+			return nil, errors.New("failed to decode clearsign block")
+		}
+		if !strings.Contains(string(block.Bytes), token) {
+			return nil, errors.New("clearsign body does not contain token")
+		}
+		return openpgp.CheckDetachedSignature(ekeys, bytes.NewReader(block.Bytes), block.ArmoredSignature.Body, nil)
+	}
+
+	signer, err := openpgp.CheckArmoredDetachedSignature(ekeys, strings.NewReader(token), strings.NewReader(signature), nil)
+	if err != nil {
+		signer, err = openpgp.CheckArmoredDetachedSignature(ekeys, strings.NewReader(token+"\n"), strings.NewReader(signature), nil)
+	}
+	if err != nil {
+		signer, err = openpgp.CheckArmoredDetachedSignature(ekeys, strings.NewReader(token+"\r\n"), strings.NewReader(signature), nil)
+	}
+	return signer, err
+}
+
 func TryGetKeyIDFromSignature(sig *packet.Signature) string {
 	if sig.IssuerKeyId != nil && (*sig.IssuerKeyId) != 0 {
 		return fmt.Sprintf("%016X", *sig.IssuerKeyId)
@@ -5,94 +5,180 @@ package asymkey

 import (
 	"context"
+	"fmt"
 	"strconv"
+	"strings"
 	"time"

 	"gitea.dev/models/db"
 	user_model "gitea.dev/models/user"
-	"gitea.dev/modules/base"
+	"gitea.dev/modules/cache"
 	"gitea.dev/modules/log"
+	"gitea.dev/modules/setting"
 )

-// This file provides functions relating verifying gpg keys
+// VerifyNonce returns true if nonce is valid (not seen before, not expired)
+// and marks it as used. It strictly validates that the nonce was generated
+// for the exact domain this instance is running on.
+func VerifyNonce(nonce string) bool {
+	parts := strings.Split(nonce, ":")
+	if len(parts) < 2 {
+		return false
+	}

-// VerifyGPGKey marks a GPG key as verified
-func VerifyGPGKey(ctx context.Context, ownerID int64, keyID, token, signature string) (string, error) {
-	return db.WithTx2(ctx, func(ctx context.Context) (string, error) {
-		key := new(GPGKey)
+	var (
+		tsHex  = parts[0]
+		domain = parts[1]
+	)

-		has, err := db.GetEngine(ctx).Where("owner_id = ? AND key_id = ?", ownerID, keyID).Get(key)
-		if err != nil {
-			return "", err
-		} else if !has {
-			return "", ErrGPGKeyNotExist{}
-		}
+	// Validate timestamp
+	if len(tsHex) != 8 {
+		return false
+	}
+	ts, err := strconv.ParseInt(tsHex, 16, 64)
+	if err != nil {
+		return false
+	}

-		if err := key.LoadSubKeys(ctx); err != nil {
-			return "", err
-		}
+	const nonceTTL = 5 * time.Minute

-		sig, err := ExtractSignature(signature)
-		if err != nil {
-			return "", ErrGPGInvalidTokenSignature{
-				ID:      key.KeyID,
-				Wrapped: err,
-			}
-		}
+	now := time.Now().Unix()
+	age := now - ts
+	if age < 0 || age > int64(nonceTTL.Seconds()) {
+		return false // expired or future timestamp
+	}

-		signer, err := hashAndVerifyWithSubKeys(sig, token, key)
-		if err != nil {
-			return "", ErrGPGInvalidTokenSignature{
-				ID:      key.KeyID,
-				Wrapped: err,
-			}
-		}
-		if signer == nil {
-			signer, err = hashAndVerifyWithSubKeys(sig, token+"\n", key)
-			if err != nil {
-				return "", ErrGPGInvalidTokenSignature{
-					ID:      key.KeyID,
-					Wrapped: err,
-				}
-			}
-		}
-		if signer == nil {
-			signer, err = hashAndVerifyWithSubKeys(sig, token+"\n\n", key)
-			if err != nil {
-				return "", ErrGPGInvalidTokenSignature{
-					ID:      key.KeyID,
-					Wrapped: err,
-				}
-			}
-		}
+	if domain != setting.Domain && domain != setting.AppURL {
+		return false
+	}

-		if signer == nil {
-			log.Debug("VerifyGPGKey failed: no signer")
-			return "", ErrGPGInvalidTokenSignature{
-				ID: key.KeyID,
-			}
-		}
+	key := fmt.Sprintf("gpg_nonce:%s", nonce)

-		if signer.PrimaryKeyID != key.KeyID && signer.KeyID != key.KeyID {
-			return "", ErrGPGKeyNotExist{}
-		}
+	_, exists := cache.GetCache().Get(key)
+	if exists {
+		return false
+	}

-		key.Verified = true
-		if _, err := db.GetEngine(ctx).ID(key.ID).Cols("verified").Update(key); err != nil {
-			return "", err
-		}
+	if err = cache.GetCache().Put(key, "1", int64(nonceTTL.Seconds())); err != nil {
+		log.Error("failed to store nonce into cache: %v", err)
+		return false
+	}

-		return key.KeyID, nil
-	})
+	return true
 }

-// VerificationToken returns token for the user that will be valid in minutes (time)
-func VerificationToken(user *user_model.User, minutes int) string {
-	return base.EncodeSha256(
-		time.Now().Truncate(1*time.Minute).Add(time.Duration(minutes)*time.Minute).Format(
-			time.RFC1123Z) + ":" +
-			user.CreatedUnix.Format(time.RFC1123Z) + ":" +
-			user.Name + ":" +
-			user.Email + ":" +
-			strconv.FormatInt(user.ID, 10))
+func VerifyGPGSignature(ctx context.Context, nonce, signature string) (*user_model.User, error) {
+	if !VerifyNonce(nonce) {
+		return nil, ErrGPGInvalidTokenSignature{}
+	}
+
+	sig, clearsignPayload, err := extractSignatureAndPayload(signature)
+	if err != nil {
+		return nil, ErrGPGInvalidTokenSignature{Wrapped: err}
+	}
+
+	if sig.IssuerKeyId == nil {
+		return nil, ErrGPGInvalidTokenSignature{}
+	}
+	keyID := fmt.Sprintf("%016X", *sig.IssuerKeyId)
+
+	key := new(GPGKey)
+	has, err := db.GetEngine(ctx).Where("key_id = ?", keyID).Get(key)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrGPGKeyNotExist{}
+	}
+
+	if err := key.LoadSubKeys(ctx); err != nil {
+		return nil, err
+	}
+
+	var signer *GPGKey
+	if clearsignPayload != "" {
+		if !strings.Contains(clearsignPayload, nonce) {
+			return nil, ErrGPGInvalidTokenSignature{}
+		}
+		signer, err = hashAndVerifyWithSubKeys(sig, clearsignPayload, key)
+	} else {
+		signer, err = hashAndVerifyWithSubKeys(sig, nonce, key)
+		if signer == nil {
+			signer, err = hashAndVerifyWithSubKeys(sig, nonce+"\n", key)
+		}
+		if signer == nil {
+			signer, err = hashAndVerifyWithSubKeys(sig, nonce+"\n\n", key)
+		}
+	}
+	if signer == nil {
+		return nil, ErrGPGInvalidTokenSignature{ID: key.KeyID, Wrapped: err}
+	}
+
+	user, err := user_model.GetUserByID(ctx, key.OwnerID)
+	if err != nil {
+		return nil, err
+	}
+
+	return user, nil
+}
+
+func VerifyGPGSignatureWithKey(nonce, signature, armoredKey string) (bool, error) {
+	if !VerifyNonce(nonce) {
+		return false, ErrGPGInvalidTokenSignature{}
+	}
+
+	sig, clearsignPayload, err := extractSignatureAndPayload(signature)
+	if err != nil {
+		return false, ErrGPGInvalidTokenSignature{Wrapped: err}
+	}
+
+	if clearsignPayload != "" && !strings.Contains(clearsignPayload, nonce) {
+		return false, ErrGPGInvalidTokenSignature{}
+	}
+
+	keys, err := CheckArmoredGPGKeyString(armoredKey)
+	if err != nil {
+		return false, err
+	}
+
+	for _, k := range keys {
+		content, err := Base64EncPubKey(k.PrimaryKey)
+		if err != nil {
+			continue
+		}
+		gpgKey := &GPGKey{
+			KeyID:   fmt.Sprintf("%016X", k.PrimaryKey.KeyId),
+			Content: content,
+			CanSign: k.PrimaryKey.CanSign(),
+		}
+
+		for _, sub := range k.Subkeys {
+			subContent, err := Base64EncPubKey(sub.PublicKey)
+			if err != nil {
+				continue
+			}
+			gpgKey.SubsKey = append(gpgKey.SubsKey, &GPGKey{
+				KeyID:   fmt.Sprintf("%016X", sub.PublicKey.KeyId),
+				Content: subContent,
+				CanSign: sub.PublicKey.CanSign(),
+			})
+		}
+
+		var signer *GPGKey
+		if clearsignPayload != "" {
+			signer, _ = hashAndVerifyWithSubKeys(sig, clearsignPayload, gpgKey)
+		} else {
+			signer, _ = hashAndVerifyWithSubKeys(sig, nonce, gpgKey)
+			if signer == nil {
+				signer, _ = hashAndVerifyWithSubKeys(sig, nonce+"\n", gpgKey)
+			}
+			if signer == nil {
+				signer, _ = hashAndVerifyWithSubKeys(sig, nonce+"\n\n", gpgKey)
+			}
+		}
+		if signer != nil {
+			return true, nil
+		}
+	}
+
+	return false, ErrGPGInvalidTokenSignature{}
 }
@@ -5,9 +5,13 @@ package asymkey

 import (
 	"context"
+	"strconv"
 	"strings"
+	"time"

 	"gitea.dev/models/db"
+	user_model "gitea.dev/models/user"
+	"gitea.dev/modules/base"
 	"gitea.dev/modules/log"

 	"github.com/42wim/sshsig"
@@ -45,3 +49,14 @@ func VerifySSHKey(ctx context.Context, ownerID int64, fingerprint, token, signat
 		return key.Fingerprint, nil
 	})
 }
+
+// VerificationToken returns token for the user that will be valid in minutes (time)
+func VerificationToken(user *user_model.User, minutes int) string {
+	return base.EncodeSha256(
+		time.Now().Truncate(1*time.Minute).Add(time.Duration(minutes)*time.Minute).Format(
+			time.RFC1123Z) + ":" +
+			user.CreatedUnix.Format(time.RFC1123Z) + ":" +
+			user.Name + ":" +
+			user.Email + ":" +
+			strconv.FormatInt(user.ID, 10))
+}
@@ -20,7 +20,6 @@ import (
 	"gitea.dev/modules/setting"

 	"strk.kbt.io/projects/go/libravatar"
-	"xorm.io/builder"
 )

 const (
@@ -100,13 +99,12 @@ func HashEmail(email string) string {
 // GetEmailForHash converts a provided md5sum to the email
 func GetEmailForHash(ctx context.Context, md5Sum string) (string, error) {
 	return cache.GetString("Avatar:"+md5Sum, func() (string, error) {
-		emailHash, has, err := db.Get[EmailHash](ctx, builder.Eq{"`hash`": strings.ToLower(strings.TrimSpace(md5Sum))})
-		if err != nil {
-			return "", err
-		} else if !has {
-			return "", nil
+		emailHash := EmailHash{
+			Hash: strings.ToLower(strings.TrimSpace(md5Sum)),
 		}
-		return emailHash.Email, nil
+
+		_, err := db.GetEngine(ctx).Get(&emailHash)
+		return emailHash.Email, err
 	})
 }

@@ -323,7 +323,13 @@ type RenamedBranch struct {

 // FindRenamedBranch check if a branch was renamed
 func FindRenamedBranch(ctx context.Context, repoID int64, from string) (branch *RenamedBranch, exist bool, err error) {
-	return db.Get[RenamedBranch](ctx, builder.Eq{"repo_id": repoID, "`from`": from})
+	branch = &RenamedBranch{
+		RepoID: repoID,
+		From:   from,
+	}
+	exist, err = db.GetEngine(ctx).Get(branch)
+
+	return branch, exist, err
 }

 // RenameBranch rename a branch
@@ -126,7 +126,8 @@ func GetLFSMetaObjectByOid(ctx context.Context, repoID int64, oid string) (*LFSM
 		return nil, ErrLFSObjectNotExist
 	}

-	m, has, err := db.Get[LFSMetaObject](ctx, builder.Eq{"repository_id": repoID, "oid": oid})
+	m := &LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}, RepositoryID: repoID}
+	has, err := db.GetEngine(ctx).Get(m)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -13,8 +13,6 @@ import (
 	"gitea.dev/models/organization"
 	"gitea.dev/modules/glob"
 	"gitea.dev/modules/timeutil"
-
-	"xorm.io/builder"
 )

 // ProtectedTag struct
@@ -113,7 +111,8 @@ func GetProtectedTagByID(ctx context.Context, id int64) (*ProtectedTag, error) {

 // GetProtectedTagByNamePattern gets protected tag by name_pattern
 func GetProtectedTagByNamePattern(ctx context.Context, repoID int64, pattern string) (*ProtectedTag, error) {
-	tag, has, err := db.Get[ProtectedTag](ctx, builder.Eq{"name_pattern": pattern, "repo_id": repoID})
+	tag := &ProtectedTag{NamePattern: pattern, RepoID: repoID}
+	has, err := db.GetEngine(ctx).Get(tag)
 	if err != nil {
 		return nil, err
 	}
@@ -79,14 +79,6 @@ func findCodeComments(ctx context.Context, opts FindCommentsOptions, issue *Issu
 		return nil, err
 	}

-	if err := comments.loadResolveDoers(ctx); err != nil {
-		return nil, err
-	}
-
-	if err := comments.loadReactions(ctx, issue.Repo); err != nil {
-		return nil, err
-	}
-
 	// Find all reviews by ReviewID
 	reviews := make(map[int64]*Review)
 	ids := make([]int64, 0, len(comments))
@@ -115,6 +107,14 @@ func findCodeComments(ctx context.Context, opts FindCommentsOptions, issue *Issu
 		comments[n] = comment
 		n++

+		if err := comment.LoadResolveDoer(ctx); err != nil {
+			return nil, err
+		}
+
+		if err := comment.LoadReactions(ctx, issue.Repo); err != nil {
+			return nil, err
+		}
+
 		var err error
 		rctx := renderhelper.NewRenderContextRepoComment(ctx, issue.Repo, renderhelper.RepoCommentOptions{
 			FootnoteContextID: strconv.FormatInt(comment.ID, 10),
@@ -11,7 +11,6 @@ import (
 	user_model "gitea.dev/models/user"
 	"gitea.dev/modules/container"
 	"gitea.dev/modules/log"
-	"gitea.dev/modules/setting"
 )

 // CommentList defines a list of comments
@@ -445,73 +444,6 @@ func (comments CommentList) loadReviews(ctx context.Context) error {
 	return nil
 }

-// loadResolveDoers bulk-loads the resolve doer for all code comments that have one.
-func (comments CommentList) loadResolveDoers(ctx context.Context) error {
-	resolveDoerIDs := container.FilterSlice(comments, func(c *Comment) (int64, bool) {
-		return c.ResolveDoerID, c.ResolveDoerID != 0 && c.Type == CommentTypeCode
-	})
-	if len(resolveDoerIDs) == 0 {
-		return nil
-	}
-
-	userMaps, err := user_model.GetUsersMapByIDs(ctx, resolveDoerIDs)
-	if err != nil {
-		return err
-	}
-
-	for _, comment := range comments {
-		if comment.ResolveDoerID == 0 || comment.Type != CommentTypeCode {
-			continue
-		}
-		if u, ok := userMaps[comment.ResolveDoerID]; ok {
-			comment.ResolveDoer = u
-		} else {
-			comment.ResolveDoer = user_model.NewGhostUser()
-		}
-	}
-	return nil
-}
-
-// loadReactions bulk-loads reactions for all comments in the list.
-func (comments CommentList) loadReactions(ctx context.Context, repo *repo_model.Repository) error {
-	if len(comments) == 0 {
-		return nil
-	}
-
-	commentIDs := container.FilterSlice(comments, func(c *Comment) (int64, bool) {
-		return c.ID, c.Reactions == nil
-	})
-	if len(commentIDs) == 0 {
-		return nil
-	}
-
-	var allReactions ReactionList
-	if err := db.GetEngine(ctx).
-		Where("`comment_id` > 0").
-		In("comment_id", commentIDs).
-		In("`type`", setting.UI.Reactions).
-		Asc("issue_id", "comment_id", "created_unix", "id").
-		Find(&allReactions); err != nil {
-		return err
-	}
-
-	if _, err := allReactions.LoadUsers(ctx, repo); err != nil {
-		return err
-	}
-
-	reactByComment := make(map[int64]ReactionList, len(commentIDs))
-	for _, r := range allReactions {
-		reactByComment[r.CommentID] = append(reactByComment[r.CommentID], r)
-	}
-
-	for _, comment := range comments {
-		if comment.Reactions == nil {
-			comment.Reactions = reactByComment[comment.ID]
-		}
-	}
-	return nil
-}
-
 // LoadAttributes loads attributes of the comments, except for attachments and
 // comments
 func (comments CommentList) LoadAttributes(ctx context.Context) (err error) {
@@ -361,8 +361,8 @@ func (issue *Issue) ResetAttributesLoaded() {

 // GetIsRead load the `IsRead` field of the issue
 func (issue *Issue) GetIsRead(ctx context.Context, userID int64) error {
-	issueUser, has, err := db.Get[IssueUser](ctx, builder.Eq{"issue_id": issue.ID, "uid": userID})
-	if err != nil {
+	issueUser := &IssueUser{IssueID: issue.ID, UID: userID}
+	if has, err := db.GetEngine(ctx).Get(issueUser); err != nil {
 		return err
 	} else if !has {
 		issue.IsRead = false
@@ -499,7 +499,11 @@ func GetIssueByIndex(ctx context.Context, repoID, index int64) (*Issue, error) {
 	if index < 1 {
 		return nil, ErrIssueNotExist{}
 	}
-	issue, has, err := db.Get[Issue](ctx, builder.Eq{"repo_id": repoID, "`index`": index})
+	issue := &Issue{
+		RepoID: repoID,
+		Index:  index,
+	}
+	has, err := db.GetEngine(ctx).Get(issue)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -591,12 +591,9 @@ func (issues IssueList) GetApprovalCounts(ctx context.Context) (map[int64][]*Rev

 func (issues IssueList) LoadIsRead(ctx context.Context, userID int64) error {
 	issueIDs := issues.getIssueIDs()
-	if len(issueIDs) == 0 {
-		return nil
-	}
 	issueUsers := make([]*IssueUser, 0, len(issueIDs))
 	if err := db.GetEngine(ctx).Where("uid =?", userID).
-		In("issue_id", issueIDs).
+		In("issue_id").
 		Find(&issueUsers); err != nil {
 		return err
 	}
@@ -11,7 +11,6 @@ import (
 	"gitea.dev/modules/setting"

 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )

 func TestIssueList_LoadRepositories(t *testing.T) {
@@ -31,22 +30,6 @@ func TestIssueList_LoadRepositories(t *testing.T) {
 	}
 }

-func TestIssueList_LoadIsRead(t *testing.T) {
-	// Regression: In("issue_id") was missing the issueIDs argument, causing
-	// xorm to generate "0=1" and never mark any issue as read.
-	require.NoError(t, unittest.PrepareTestDatabase())
-
-	issue1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
-	issue2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
-
-	// Fixture: uid=1 has is_read=true on issue 1 only.
-	issueList := issues_model.IssueList{issue1, issue2}
-	require.NoError(t, issueList.LoadIsRead(t.Context(), 1))
-
-	assert.True(t, issue1.IsRead, "issue 1 should be marked read for user 1")
-	assert.False(t, issue2.IsRead, "issue 2 should not be marked read for user 1")
-}
-
 func TestIssueList_LoadAttributes(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	setting.Service.EnableTimetracking = true
@@ -599,7 +599,7 @@ func ResolveIssueMentionsByVisibility(ctx context.Context, issue *Issue, doer *u
 					resolved[issue.Repo.Owner.LowerName+"/"+team.LowerName] = true
 					continue
 				}
-				has, err := db.Exist[organization.TeamUnit](ctx, builder.Eq{"org_id": issue.Repo.Owner.ID, "team_id": team.ID, "`type`": unittype})
+				has, err := db.GetEngine(ctx).Get(&organization.TeamUnit{OrgID: issue.Repo.Owner.ID, TeamID: team.ID, Type: unittype})
 				if err != nil {
 					return nil, fmt.Errorf("get team units (%d): %w", team.ID, err)
 				}
@@ -13,8 +13,6 @@ import (
 	user_model "gitea.dev/models/user"
 	"gitea.dev/modules/log"
 	"gitea.dev/modules/references"
-
-	"xorm.io/builder"
 )

 type crossReference struct {
@@ -191,11 +189,11 @@ func (issue *Issue) updateCrossReferenceList(list []*crossReference, xref *cross
 func (issue *Issue) verifyReferencedIssue(stdCtx context.Context, ctx *crossReferencesContext, repo *repo_model.Repository,
 	ref references.IssueReference,
 ) (*Issue, references.XRefAction, error) {
+	refIssue := &Issue{RepoID: repo.ID, Index: ref.Index}
 	refAction := ref.Action
-	refIssue, has, err := db.Get[Issue](stdCtx, builder.Eq{"repo_id": repo.ID, "`index`": ref.Index})
-	if err != nil {
-		return nil, references.XRefActionNone, err
-	} else if !has {
+	e := db.GetEngine(stdCtx)
+
+	if has, _ := e.Get(refIssue); !has {
 		return nil, references.XRefActionNone, nil
 	}
 	if err := refIssue.LoadRepo(stdCtx); err != nil {
@@ -535,8 +535,12 @@ func GetPullRequestByIndex(ctx context.Context, repoID, index int64) (*PullReque
 	if index < 1 {
 		return nil, ErrPullRequestNotExist{}
 	}
+	pr := &PullRequest{
+		BaseRepoID: repoID,
+		Index:      index,
+	}

-	pr, has, err := db.Get[PullRequest](ctx, builder.Eq{"base_repo_id": repoID, "`index`": index})
+	has, err := db.GetEngine(ctx).Get(pr)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -0,0 +1,42 @@
+// Copyright 2026 The M8SH Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package mail
+
+import (
+	"context"
+
+	"gitea.dev/models/db"
+)
+
+// Attachment is the metadata for an email attachment or inline media.
+// Blobs themselves are stored in the gitea storage backend (storage_path).
+type Attachment struct {
+	ID          int64  `xorm:"pk autoincr"`
+	MessageID   int64  `xorm:"INDEX"`
+	StoragePath string `xorm:"VARCHAR(500)"`
+	ContentType string `xorm:"VARCHAR(100)"`
+	Filename    string `xorm:"VARCHAR(255)"`
+	Size        int64
+	IsInline    bool
+	ContentID   string `xorm:"VARCHAR(255)"` // for inline: Content-ID value
+}
+
+func (a *Attachment) TableName() string {
+	return "m8sh_attachment"
+}
+
+func init() {
+	db.RegisterModel(new(Attachment))
+}
+
+// InsertAttachment stores attachment metadata.
+func InsertAttachment(ctx context.Context, a *Attachment) error {
+	return db.Insert(ctx, a)
+}
+
+// ListAttachmentsByMessage returns all attachments for a message.
+func ListAttachmentsByMessage(ctx context.Context, messageID int64) ([]*Attachment, error) {
+	var atts []*Attachment
+	return atts, db.GetEngine(ctx).Where("message_id = ?", messageID).Asc("id").Find(&atts)
+}
@@ -0,0 +1,76 @@
+// Copyright 2026 The M8SH Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package mail
+
+import (
+	"context"
+	"errors"
+
+	"gitea.dev/models/db"
+	"gitea.dev/modules/timeutil"
+)
+
+// ErrConversationNotExist is returned when no conversation matches.
+var ErrConversationNotExist = errors.New("conversation does not exist")
+
+// Conversation is a unique thread of messages between participants.
+type Conversation struct {
+	ID           int64              `xorm:"pk autoincr"`
+	OwnerUID     int64              `xorm:"INDEX"`
+	Participants string             // JSON: ["a@x.com","b@y.com"]
+	Subject      string             `xorm:"VARCHAR(500)"`
+	UpdatedAt    timeutil.TimeStamp `xorm:"INDEX updated"`
+}
+
+func (c *Conversation) TableName() string {
+	return "m8sh_conversation"
+}
+
+func init() {
+	db.RegisterModel(new(Conversation))
+}
+
+// GetOrCreateConversationForUser finds an existing conversation for an owner
+// matching the participants set, or creates a new one. participantsKey is the
+// canonical sorted/serialized participant set used for matching.
+func GetOrCreateConversationForUser(ctx context.Context, ownerUID int64, participantsJSON, subject string) (*Conversation, error) {
+	existing := &Conversation{}
+	has, err := db.GetEngine(ctx).Where("owner_uid = ?", ownerUID).
+		And("participants = ?", participantsJSON).Get(existing)
+	if err != nil {
+		return nil, err
+	}
+	if has {
+		return existing, nil
+	}
+	c := &Conversation{
+		OwnerUID:     ownerUID,
+		Participants: participantsJSON,
+		Subject:      subject,
+	}
+	if err := db.Insert(ctx, c); err != nil {
+		return nil, err
+	}
+	return c, nil
+}
+
+// ListConversationsForUser returns conversations for an owner, newest first.
+func ListConversationsForUser(ctx context.Context, ownerUID int64) ([]*Conversation, error) {
+	var convs []*Conversation
+	return convs, db.GetEngine(ctx).Where("owner_uid = ?", ownerUID).
+		Desc("updated_at").Find(&convs)
+}
+
+// GetConversationForUser returns one conversation, verifying ownership.
+func GetConversationForUser(ctx context.Context, ownerUID, id int64) (*Conversation, error) {
+	c := &Conversation{}
+	has, err := db.GetEngine(ctx).Where("id = ?", id).And("owner_uid = ?", ownerUID).Get(c)
+	if err != nil {
+		return nil, err
+	}
+	if !has {
+		return nil, ErrConversationNotExist
+	}
+	return c, nil
+}
@@ -0,0 +1,53 @@
+// Copyright 2026 The M8SH Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package mail
+
+import (
+	"context"
+	"errors"
+
+	"gitea.dev/models/db"
+	"gitea.dev/modules/timeutil"
+)
+
+// Health records the result of a mail server healthcheck run.
+type Health struct {
+	ID        int64              `xorm:"pk autoincr"`
+	CheckedAt timeutil.TimeStamp `xorm:"INDEX"`
+	SMTPOk    bool
+	DNSSpf    bool
+	DNSDkim   bool
+	DNSDmarc  bool
+	DNSPtr    bool
+	ErrorMsg  string `xorm:"TEXT"`
+}
+
+func (h *Health) TableName() string {
+	return "m8sh_health"
+}
+
+func init() {
+	db.RegisterModel(new(Health))
+}
+
+// InsertHealth stores a new healthcheck result.
+func InsertHealth(ctx context.Context, h *Health) error {
+	return db.Insert(ctx, h)
+}
+
+// ErrHealthNotExist is returned when no healthcheck record exists yet.
+var ErrHealthNotExist = errors.New("no healthcheck record")
+
+// LatestHealth returns the most recent healthcheck record, or nil if none.
+func LatestHealth(ctx context.Context) (*Health, error) {
+	h := &Health{}
+	has, err := db.GetEngine(ctx).Desc("checked_at").Get(h)
+	if err != nil {
+		return nil, err
+	}
+	if !has {
+		return nil, ErrHealthNotExist
+	}
+	return h, nil
+}
@@ -0,0 +1,74 @@
+// Copyright 2026 The M8SH Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package mail
+
+import (
+	"context"
+
+	"gitea.dev/models/db"
+	"gitea.dev/modules/timeutil"
+)
+
+// Transport describes how a message was delivered.
+type Transport int
+
+const (
+	// TransportSMTP means delivered via standard SMTP (port 25).
+	TransportSMTP Transport = 0
+	// TransportM8shHTTP means delivered via the M8SH HTTP endpoint.
+	TransportM8shHTTP Transport = 1
+)
+
+// Message is a single email/M8SH message in a conversation.
+type Message struct {
+	ID             int64              `xorm:"pk autoincr"`
+	ConversationID int64              `xorm:"INDEX"`
+	UID            int64              // 0 = external sender
+	FromAddr       string             `xorm:"VARCHAR(255)"`
+	MessageID      string             `xorm:"VARCHAR(500)"` // RFC Message-ID header
+	InReplyTo      string             `xorm:"VARCHAR(500)"`
+	Subject        string             `xorm:"VARCHAR(500)"`
+	ContentType    string             `xorm:"VARCHAR(50)"` // text/plain | text/html
+	Body           string             `xorm:"LONGTEXT"`
+	IsRead         bool               `xorm:"DEFAULT false"`
+	Transport      Transport          // 0=smtp 1=m8sh http
+	ReceivedUnix   timeutil.TimeStamp `xorm:"INDEX"`
+}
+
+func (m *Message) TableName() string {
+	return "m8sh_message"
+}
+
+func init() {
+	db.RegisterModel(new(Message))
+}
+
+// InsertMessage stores a new message.
+func InsertMessage(ctx context.Context, m *Message) error {
+	return db.Insert(ctx, m)
+}
+
+// ListMessagesByConversation returns messages for a conversation, oldest first.
+func ListMessagesByConversation(ctx context.Context, conversationID int64) ([]*Message, error) {
+	var msgs []*Message
+	return msgs, db.GetEngine(ctx).Where("conversation_id = ?", conversationID).
+		Asc("received_unix").Find(&msgs)
+}
+
+// MarkConversationRead marks all messages in a conversation as read.
+func MarkConversationRead(ctx context.Context, conversationID int64) error {
+	_, err := db.GetEngine(ctx).Where("conversation_id = ?", conversationID).
+		Cols("is_read").Update(&Message{IsRead: true})
+	return err
+}
+
+// UnreadCount returns the number of unread messages for an owner.
+func UnreadCount(ctx context.Context, ownerUID int64) (int64, error) {
+	return db.GetEngine(ctx).
+		Table("m8sh_message").
+		Join("INNER", "m8sh_conversation", "m8sh_conversation.id = m8sh_message.conversation_id").
+		Where("m8sh_conversation.owner_uid = ?", ownerUID).
+		And("m8sh_message.is_read = ?", false).
+		Count()
+}
@@ -0,0 +1,84 @@
+// Copyright 2026 The M8SH Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+// Package m8sh contains M8SH-specific migrations, tracked separately from
+// upstream Gitea's version table via the m8sh_version table. This keeps M8SH
+// merges from upstream conflict-free.
+package m8sh
+
+import (
+	"context"
+	"fmt"
+
+	"gitea.dev/models/db"
+	"gitea.dev/modules/log"
+
+	"xorm.io/xorm/names"
+)
+
+// migration is a single M8SH database migration step.
+type migration struct {
+	idNumber int64
+	desc     string
+	migrate  func(context.Context, db.EngineMigration) error
+}
+
+// preparedMigrations is the ordered list of M8SH migrations.
+var preparedMigrations = []*migration{
+	m0001CreateMailTables,
+}
+
+// Version describes the m8sh_version table row.
+type Version struct {
+	ID      int64 `xorm:"pk autoincr"`
+	Version int64
+}
+
+// expectedVersion returns the expected M8SH schema version.
+func expectedVersion() int64 {
+	return int64(len(preparedMigrations))
+}
+
+// Migrate runs any pending M8SH migrations. It is independent of Gitea's own
+// migration runner and uses a dedicated m8sh_version table.
+func Migrate(ctx context.Context, x db.EngineMigration) error {
+	x.SetMapper(names.GonicMapper{})
+	if err := x.Sync(new(Version)); err != nil {
+		return fmt.Errorf("m8sh: sync version table: %w", err)
+	}
+
+	v := &Version{ID: 1}
+	has, err := x.Get(v)
+	if err != nil {
+		return fmt.Errorf("m8sh: get version: %w", err)
+	}
+
+	// current is the DB's recorded migration level. On a fresh install there is
+	// no row yet, so current = 0 and every migration step runs (creating the
+	// m8sh_* tables). This keeps the migration self-contained: it does NOT rely
+	// on SyncAllTables having registered the models/mail beans.
+	current := int64(0)
+	if !has {
+		v.ID = 0
+		v.Version = 0
+		if _, err := x.Insert(v); err != nil {
+			return fmt.Errorf("m8sh: insert version: %w", err)
+		}
+	} else {
+		current = v.Version
+	}
+
+	for i := current; i < expectedVersion(); i++ {
+		m := preparedMigrations[i]
+		log.Info("M8SH Migration[%d]: %s", m.idNumber, m.desc)
+		x.SetMapper(names.GonicMapper{})
+		if err := m.migrate(ctx, x); err != nil {
+			return fmt.Errorf("m8sh: migration[%d] %s failed: %w", m.idNumber, m.desc, err)
+		}
+		v.Version = m.idNumber + 1
+		if _, err := x.ID(1).Update(v); err != nil {
+			return fmt.Errorf("m8sh: update version: %w", err)
+		}
+	}
+	return nil
+}
@@ -0,0 +1,90 @@
+// Copyright 2026 The M8SH Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package m8sh
+
+import (
+	"testing"
+
+	"gitea.dev/models/db"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"xorm.io/xorm"
+	"xorm.io/xorm/names"
+)
+
+// TestMigrate_FreshInstall verifies the runner records the latest version on a
+// fresh database and that the version row is present. Uses the sqlite3 driver
+// registered by gitea.dev/models/db (modernc by default).
+func TestMigrate_FreshInstall(t *testing.T) {
+	x := newTestEngine(t)
+
+	err := Migrate(t.Context(), x)
+	require.NoError(t, err)
+
+	// The version table must exist with the expected version.
+	v := &Version{ID: 1}
+	has, err := x.Get(v)
+	require.NoError(t, err)
+	assert.True(t, has)
+	// After migration m0001 (idNumber=1), recorded version is idNumber+1 = 2.
+	lastMigration := preparedMigrations[len(preparedMigrations)-1]
+	assert.Equal(t, lastMigration.idNumber+1, v.Version)
+}
+
+// TestMigrate_Idempotent verifies running Migrate twice is a no-op (version
+// stays the same, no error).
+func TestMigrate_Idempotent(t *testing.T) {
+	x := newTestEngine(t)
+	require.NoError(t, Migrate(t.Context(), x))
+	v1 := getVersion(t, x)
+
+	require.NoError(t, Migrate(t.Context(), x))
+	v2 := getVersion(t, x)
+	assert.Equal(t, v1, v2)
+}
+
+// TestExpectedVersion verifies the version equals the number of migrations.
+func TestExpectedVersion(t *testing.T) {
+	assert.Equal(t, expectedVersion(), int64(len(preparedMigrations)))
+}
+
+// TestMigrate_CreatesExpectedTables verifies the migration creates the four
+// m8sh_* tables (and NOT a bare "attachment" table that would collide with
+// Gitea's repo.attachment which has a uuid column).
+func TestMigrate_CreatesExpectedTables(t *testing.T) {
+	x := newTestEngine(t)
+	require.NoError(t, Migrate(t.Context(), x))
+
+	for _, table := range []string{"m8sh_conversation", "m8sh_message", "m8sh_attachment", "m8sh_health"} {
+		exist, err := x.IsTableExist(table)
+		require.NoError(t, err)
+		assert.True(t, exist, "expected table %s to exist", table)
+	}
+
+	// A bare "attachment" table must NOT have been created by M8SH (it would
+	// shadow Gitea's own attachment table and trigger the uuid-column error).
+	exist, err := x.IsTableExist("attachment")
+	require.NoError(t, err)
+	assert.False(t, exist, `M8SH must not create a bare "attachment" table`)
+}
+
+func newTestEngine(t *testing.T) *xorm.Engine {
+	t.Helper()
+	x, err := xorm.NewEngine("sqlite3", "file::memory:?_pragma=busy_timeout(5000)&_txlock=immediate")
+	require.NoError(t, err)
+	x.SetMapper(names.GonicMapper{})
+	// reference db so its init() registers the sqlite3 driver.
+	_ = db.MaxBatchInsertSize
+	return x
+}
+
+func getVersion(t *testing.T, x *xorm.Engine) int64 {
+	t.Helper()
+	v := &Version{ID: 1}
+	has, err := x.Get(v)
+	require.NoError(t, err)
+	require.True(t, has)
+	return v.Version
+}
@@ -0,0 +1,89 @@
+// Copyright 2026 The M8SH Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package m8sh
+
+import (
+	"context"
+
+	"gitea.dev/models/db"
+	"gitea.dev/modules/timeutil"
+)
+
+// These package-level structs are the migration-time table definitions. They
+// mirror the xorm tags of the models/mail package beans but carry explicit
+// TableName() methods so xorm creates exactly the m8sh_* tables (independent
+// of the GonicMapper, which would otherwise mangle the M8SH prefix and —
+// worse — collide with Gitea's own `attachment` table).
+
+type m8shConversation struct {
+	ID           int64              `xorm:"pk autoincr"`
+	OwnerUID     int64              `xorm:"INDEX"`
+	Participants string             // JSON array of addresses
+	Subject      string             `xorm:"VARCHAR(500)"`
+	UpdatedAt    timeutil.TimeStamp `xorm:"INDEX updated"`
+}
+
+func (m8shConversation) TableName() string { return "m8sh_conversation" }
+
+type m8shMessage struct {
+	ID             int64              `xorm:"pk autoincr"`
+	ConversationID int64              `xorm:"INDEX"`
+	UID            int64              // 0 = external sender
+	FromAddr       string             `xorm:"VARCHAR(255)"`
+	MessageID      string             `xorm:"VARCHAR(500)"`
+	InReplyTo      string             `xorm:"VARCHAR(500)"`
+	Subject        string             `xorm:"VARCHAR(500)"`
+	ContentType    string             `xorm:"VARCHAR(50)"`
+	Body           string             `xorm:"LONGTEXT"`
+	IsRead         bool               `xorm:"DEFAULT false"`
+	Transport      int                `xorm:"TINYINT DEFAULT 0"` // 0=smtp 1=m8sh http
+	ReceivedUnix   timeutil.TimeStamp `xorm:"INDEX"`
+}
+
+func (m8shMessage) TableName() string { return "m8sh_message" }
+
+type m8shAttachment struct {
+	ID          int64  `xorm:"pk autoincr"`
+	MessageID   int64  `xorm:"INDEX"`
+	StoragePath string `xorm:"VARCHAR(500)"`
+	ContentType string `xorm:"VARCHAR(100)"`
+	Filename    string `xorm:"VARCHAR(255)"`
+	Size        int64
+	IsInline    bool
+	ContentID   string `xorm:"VARCHAR(255)"`
+}
+
+func (m8shAttachment) TableName() string { return "m8sh_attachment" }
+
+type m8shHealth struct {
+	ID        int64              `xorm:"pk autoincr"`
+	CheckedAt timeutil.TimeStamp `xorm:"INDEX"`
+	SMTPOk    bool
+	DNSSpf    bool
+	DNSDkim   bool
+	DNSDmarc  bool
+	DNSPtr    bool
+	ErrorMsg  string `xorm:"TEXT"`
+}
+
+func (m8shHealth) TableName() string { return "m8sh_health" }
+
+// m0001CreateMailTables creates all M8SH mail tables in one migration.
+var m0001CreateMailTables = &migration{
+	idNumber: 1,
+	desc:     "create m8sh mail tables (conversation, message, attachment, health)",
+	migrate: func(_ context.Context, x db.EngineMigration) error {
+		for _, bean := range []any{
+			new(m8shConversation),
+			new(m8shMessage),
+			new(m8shAttachment),
+			new(m8shHealth),
+		} {
+			if err := x.Sync(bean); err != nil {
+				return err
+			}
+		}
+		return nil
+	},
+}
@@ -417,9 +417,6 @@ func prepareMigrationTasks() []*migration {
 		newMigration(337, "Add visibility to team", v1_27.AddVisibilityToTeam),
 		newMigration(338, "Expand legacy MSSQL issue/comment long-text columns", v1_27.ExpandIssueAndCommentLongTextFieldsForMSSQL),
 		newMigration(339, "Extend action c_u index to include created_unix for faster dashboard feed queries", v1_27.AddCreatedUnixToActionUserIsDeletedIndex),
-		newMigration(340, "Add ContinueOnError column to ActionRunJob", v1_27.AddContinueOnErrorToActionRunJob),
-		newMigration(341, "Convert legacy MSSQL DATETIME columns to DATETIME2", v1_27.FixLegacyMSSQLDateTimeColumns),
-		newMigration(342, "Add scoped workflows schema", v1_27.AddScopedWorkflowsSchema),
 	}
 	return preparedMigrations
 }
@@ -1,24 +0,0 @@
-// Copyright 2026 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package v1_27
-
-import (
-	"gitea.dev/models/db"
-
-	"xorm.io/xorm"
-)
-
-// AddContinueOnErrorToActionRunJob adds the ContinueOnError column to ActionRunJob,
-// storing the job-level continue-on-error value from the workflow YAML.
-func AddContinueOnErrorToActionRunJob(x db.EngineMigration) error {
-	type ActionRunJob struct {
-		ContinueOnError bool `xorm:"NOT NULL DEFAULT FALSE"`
-	}
-
-	_, err := x.SyncWithOptions(xorm.SyncOptions{
-		IgnoreDropIndices: true,
-		IgnoreConstrains:  true,
-	}, new(ActionRunJob))
-	return err
-}
@@ -1,80 +0,0 @@
-// Copyright 2026 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package v1_27
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"gitea.dev/models/db"
-	"gitea.dev/models/migrations/base"
-
-	"xorm.io/xorm/schemas"
-)
-
-// legacyDateTimeColumns are the persisted real datetime columns that old Gitea
-// versions created as MSSQL DATETIME. Every other time value is stored as a
-// unix timestamp integer, so these are the only columns affected.
-var legacyDateTimeColumns = []struct {
-	bean   any
-	column string
-}{
-	{new(externalLoginUserWithExpiresAt), "expires_at"},
-	{new(lfsLockWithCreated), "created"},
-}
-
-type externalLoginUserWithExpiresAt struct {
-	ExpiresAt time.Time
-}
-
-func (externalLoginUserWithExpiresAt) TableName() string {
-	return "external_login_user"
-}
-
-type lfsLockWithCreated struct {
-	Created time.Time `xorm:"created"`
-}
-
-func (lfsLockWithCreated) TableName() string {
-	return "lfs_lock"
-}
-
-// FixLegacyMSSQLDateTimeColumns converts legacy locale-dependent DATETIME columns
-// to DATETIME2. Databases created by old Gitea versions stored these columns as
-// DATETIME, which fails to parse ISO datetime strings ('YYYY-MM-DD HH:MM:SS')
-// when the MSSQL session language is not English, breaking external account
-// linking and LFS lock creation. New installs already use DATETIME2, so only
-// legacy MSSQL columns need converting.
-func FixLegacyMSSQLDateTimeColumns(x db.EngineMigration) error {
-	if x.Dialect().URI().DBType != schemas.MSSQL {
-		return nil
-	}
-
-	for _, c := range legacyDateTimeColumns {
-		table, err := x.TableInfo(c.bean)
-		if err != nil {
-			return err
-		}
-
-		var dataType string
-		has, err := x.SQL("SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? AND COLUMN_NAME = ?", table.Name, c.column).Get(&dataType)
-		if err != nil {
-			return err
-		}
-		if !has || !strings.EqualFold(dataType, "datetime") {
-			continue
-		}
-
-		column := table.GetColumn(c.column)
-		if column == nil {
-			return fmt.Errorf("column %s does not exist in table %s", c.column, table.Name)
-		}
-		if err := base.ModifyColumn(x, table.Name, column); err != nil {
-			return fmt.Errorf("modify %s.%s: %w", table.Name, c.column, err)
-		}
-	}
-
-	return nil
-}
@@ -1,80 +0,0 @@
-// Copyright 2026 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package v1_27
-
-import (
-	"testing"
-	"time"
-
-	"gitea.dev/models/db"
-	"gitea.dev/models/migrations/migrationtest"
-	"gitea.dev/modules/setting"
-
-	"github.com/stretchr/testify/require"
-)
-
-type externalLoginUserBeforeDateTimeMigration struct {
-	ExternalID    string    `xorm:"pk NOT NULL"`
-	LoginSourceID int64     `xorm:"pk NOT NULL"`
-	ExpiresAt     time.Time // sync creates DATETIME2; downgraded to legacy DATETIME via raw SQL below
-}
-
-func (externalLoginUserBeforeDateTimeMigration) TableName() string {
-	return "external_login_user"
-}
-
-type lfsLockBeforeDateTimeMigration struct {
-	ID      int64     `xorm:"pk autoincr"`
-	Created time.Time `xorm:"created"`
-}
-
-func (lfsLockBeforeDateTimeMigration) TableName() string {
-	return "lfs_lock"
-}
-
-func Test_FixLegacyMSSQLDateTimeColumns(t *testing.T) {
-	if !setting.Database.Type.IsMSSQL() {
-		t.Skip("Only MSSQL needs to convert the legacy locale-dependent DATETIME columns")
-	}
-
-	x, deferrable := migrationtest.PrepareTestEnv(t, 0,
-		new(externalLoginUserBeforeDateTimeMigration),
-		new(lfsLockBeforeDateTimeMigration),
-	)
-	defer deferrable()
-
-	// Force the legacy DATETIME column type that old Gitea versions created.
-	_, err := x.Exec("ALTER TABLE [external_login_user] ALTER COLUMN [expires_at] DATETIME")
-	require.NoError(t, err)
-	_, err = x.Exec("ALTER TABLE [lfs_lock] ALTER COLUMN [created] DATETIME")
-	require.NoError(t, err)
-	require.Equal(t, "datetime", mssqlColumnType(t, x, "external_login_user", "expires_at"))
-	require.Equal(t, "datetime", mssqlColumnType(t, x, "lfs_lock", "created"))
-
-	require.NoError(t, FixLegacyMSSQLDateTimeColumns(x))
-	require.NoError(t, FixLegacyMSSQLDateTimeColumns(x)) // idempotent
-
-	require.Equal(t, "datetime2", mssqlColumnType(t, x, "external_login_user", "expires_at"))
-	require.Equal(t, "datetime2", mssqlColumnType(t, x, "lfs_lock", "created"))
-
-	// Inserting an ISO-formatted datetime must succeed even under a non-English
-	// locale, which is the failure the legacy DATETIME columns produced. The
-	// SET LANGUAGE and INSERT run in one Exec so they share a single connection.
-	_, err = x.Exec("SET LANGUAGE German; " +
-		"INSERT INTO [external_login_user] ([external_id], [login_source_id], [expires_at]) " +
-		"VALUES ('ext-id', 1, '2026-06-25 11:58:39')")
-	require.NoError(t, err)
-	_, err = x.Exec("SET LANGUAGE German; " +
-		"INSERT INTO [lfs_lock] ([created]) VALUES ('2026-06-25 11:58:39')")
-	require.NoError(t, err)
-}
-
-func mssqlColumnType(t *testing.T, x db.EngineMigration, table, column string) string {
-	t.Helper()
-	var dataType string
-	has, err := x.SQL("SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? AND COLUMN_NAME = ?", table, column).Get(&dataType)
-	require.NoError(t, err)
-	require.True(t, has)
-	return dataType
-}
@@ -1,42 +0,0 @@
-// Copyright 2026 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package v1_27
-
-import (
-	"gitea.dev/models/db"
-	"gitea.dev/modules/timeutil"
-
-	"xorm.io/xorm"
-)
-
-func AddScopedWorkflowsSchema(x db.EngineMigration) error {
-	// Create the action_scoped_workflow_source table
-	type ScopedWorkflowConfig struct {
-		Required bool     `json:"required"`
-		Patterns []string `json:"patterns"`
-	}
-	type ActionScopedWorkflowSource struct {
-		ID              int64                            `xorm:"pk autoincr"`
-		OwnerID         int64                            `xorm:"UNIQUE(owner_repo) NOT NULL DEFAULT 0"`
-		SourceRepoID    int64                            `xorm:"INDEX UNIQUE(owner_repo) NOT NULL DEFAULT 0"`
-		WorkflowConfigs map[string]*ScopedWorkflowConfig `xorm:"JSON TEXT 'workflow_configs'"`
-		CreatedUnix     timeutil.TimeStamp               `xorm:"created"`
-		UpdatedUnix     timeutil.TimeStamp               `xorm:"updated"`
-	}
-	if err := x.Sync(new(ActionScopedWorkflowSource)); err != nil {
-		return err
-	}
-
-	// Add the columns that record where a run's workflow content came from
-	type ActionRun struct {
-		WorkflowRepoID    int64  `xorm:"NOT NULL DEFAULT 0"`
-		WorkflowCommitSHA string `xorm:"VARCHAR(64) NOT NULL DEFAULT ''"`
-		IsScopedRun       bool   `xorm:"NOT NULL DEFAULT false"`
-	}
-	_, err := x.SyncWithOptions(xorm.SyncOptions{
-		IgnoreDropIndices: true,
-		IgnoreConstrains:  true,
-	}, new(ActionRun))
-	return err
-}
@@ -411,8 +411,11 @@ func GetOrgByName(ctx context.Context, name string) (*Organization, error) {
 	if len(name) == 0 {
 		return nil, ErrOrgNotExist{0, name}
 	}
-
-	u, has, err := db.Get[Organization](ctx, builder.Eq{"lower_name": strings.ToLower(name), "`type`": user_model.UserTypeOrganization})
+	u := &Organization{
+		LowerName: strings.ToLower(name),
+		Type:      user_model.UserTypeOrganization,
+	}
+	has, err := db.GetEngine(ctx).Get(u)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -58,7 +58,7 @@ func GetProperties(ctx context.Context, refType PropertyType, refID int64) ([]*P
 // GetPropertiesByName gets all properties with a specific name
 func GetPropertiesByName(ctx context.Context, refType PropertyType, refID int64, name string) ([]*PackageProperty, error) {
 	pps := make([]*PackageProperty, 0, 10)
-	return pps, db.GetEngine(ctx).Where("ref_type = ? AND ref_id = ? AND `name` = ?", refType, refID, name).OrderBy("id").Find(&pps)
+	return pps, db.GetEngine(ctx).Where("ref_type = ? AND ref_id = ? AND name = ?", refType, refID, name).OrderBy("id").Find(&pps)
 }

 // UpdateProperty updates a property
@@ -68,12 +68,13 @@ func UpdateProperty(ctx context.Context, pp *PackageProperty) error {
 }

 func InsertOrUpdateProperty(ctx context.Context, refType PropertyType, refID int64, name, value string) error {
-	pp, ok, err := db.Get[PackageProperty](ctx, builder.Eq{"ref_type": refType, "ref_id": refID, "`name`": name})
+	pp := PackageProperty{RefType: refType, RefID: refID, Name: name}
+	ok, err := db.GetEngine(ctx).Get(&pp)
 	if err != nil {
 		return err
 	}
 	if ok {
-		_, err = db.GetEngine(ctx).ID(pp.ID).Cols("value").Update(&PackageProperty{Value: value})
+		_, err = db.GetEngine(ctx).Where("ref_type=? AND ref_id=? AND name=?", refType, refID, name).Cols("value").Update(&PackageProperty{Value: value})
 		return err
 	}
 	_, err = InsertProperty(ctx, refType, refID, name, value)
@@ -164,7 +164,9 @@ func DeleteVersionsByPackageID(ctx context.Context, packageID int64) error {

 // HasVersionFileReferences checks if there are associated files
 func HasVersionFileReferences(ctx context.Context, versionID int64) (bool, error) {
-	return db.Exist[PackageFile](ctx, builder.Eq{"version_id": versionID})
+	return db.GetEngine(ctx).Get(&PackageFile{
+		VersionID: versionID,
+	})
 }

 // SearchValue describes a value to search
@@ -95,40 +95,6 @@ func TestGetActionsUserRepoPermission(t *testing.T) {
 		assert.False(t, perm.CanRead(unit.TypeCode))
 	})

-	t.Run("CollaborativeOwner_ForkPR_Denied", func(t *testing.T) {
-		// Target repo15 trusts repo2's owner as a collaborative owner.
-		repo15ActionsUnit := repo15.MustGetUnit(ctx, unit.TypeActions)
-		repo15ActionsUnit.ActionsConfig().AddCollaborativeOwner(owner2.ID)
-		require.NoError(t, repo_model.UpdateRepoUnitConfig(ctx, repo15ActionsUnit))
-
-		// Owner cross-repo policy does not allow repo15, so the only branch that
-		// could grant access is the collaborative-owner one.
-		require.NoError(t, actions_model.SetOwnerActionsConfig(ctx, owner2.ID, actions_model.OwnerActionsConfig{}))
-
-		task53 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 53})
-
-		// Non-fork task is legitimately granted code-read via collaborative owner.
-		task53.IsForkPullRequest = false
-		require.NoError(t, actions_model.UpdateTask(ctx, task53, "is_fork_pull_request"))
-		perm, err := GetActionsUserRepoPermission(ctx, repo15, actionsUser, task53.ID)
-		require.NoError(t, err)
-		assert.True(t, perm.CanRead(unit.TypeCode))
-
-		// Fork PR must NOT be able to read a third private repo through the
-		// collaborative-owner branch.
-		task53.IsForkPullRequest = true
-		require.NoError(t, actions_model.UpdateTask(ctx, task53, "is_fork_pull_request"))
-		perm, err = GetActionsUserRepoPermission(ctx, repo15, actionsUser, task53.ID)
-		require.NoError(t, err)
-		assert.False(t, perm.CanRead(unit.TypeCode))
-
-		// Restore state for subsequent subtests.
-		task53.IsForkPullRequest = false
-		require.NoError(t, actions_model.UpdateTask(ctx, task53, "is_fork_pull_request"))
-		repo15ActionsUnit.ActionsConfig().RemoveCollaborativeOwner(owner2.ID)
-		require.NoError(t, repo_model.UpdateRepoUnitConfig(ctx, repo15ActionsUnit))
-	})
-
 	t.Run("Inheritance_And_Clamping", func(t *testing.T) {
 		task53 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 53})
 		task53.IsForkPullRequest = false
@@ -369,9 +369,7 @@ func GetActionsUserRepoPermission(ctx context.Context, repo *repo_model.Reposito
 	// 2. The Actions Bot user has been explicitly granted access and repository is private
 	// 3. The repository is public (handled by botPerm above)

-	// Fork PRs are never allowed cross-repo access to other private repositories,
-	// matching the discriminator enforced by checkSameOwnerCrossRepoAccess above.
-	if taskRepo.IsPrivate && !task.IsForkPullRequest {
+	if taskRepo.IsPrivate {
 		actionsUnit := repo.MustGetUnit(ctx, unit.TypeActions)
 		if actionsUnit.ActionsConfig().IsCollaborativeOwner(taskRepo.OwnerID) {
 			return maxPerm, nil
@@ -11,8 +11,6 @@ import (
 	"gitea.dev/models/db"
 	"gitea.dev/modules/log"
 	"gitea.dev/modules/timeutil"
-
-	"xorm.io/builder"
 )

 // ViewedState stores for a file in which state it is currently viewed
@@ -68,14 +66,9 @@ func (rs *ReviewState) GetViewedFileCount() int {
 // If the review didn't exist before in the database, it won't afterwards either.
 // The returned boolean shows whether the review exists in the database
 func GetReviewState(ctx context.Context, userID, pullID int64, commitSHA string) (*ReviewState, bool, error) {
-	review, has, err := db.Get[ReviewState](ctx, builder.Eq{"user_id": userID, "pull_id": pullID, "commit_sha": commitSHA})
-	if err != nil {
-		return nil, false, err
-	}
-	if review == nil {
-		review = &ReviewState{UserID: userID, PullID: pullID, CommitSHA: commitSHA}
-	}
-	return review, has, nil
+	review := &ReviewState{UserID: userID, PullID: pullID, CommitSHA: commitSHA}
+	has, err := db.GetEngine(ctx).Get(review)
+	return review, has, err
 }

 // UpdateReviewState updates the given review inside the database, regardless of whether it existed before or not
@@ -17,8 +17,6 @@ import (
 	"gitea.dev/modules/storage"
 	"gitea.dev/modules/timeutil"
 	"gitea.dev/modules/util"
-
-	"xorm.io/builder"
 )

 // Attachment represent a attachment of issue/comment/release.
@@ -158,7 +156,8 @@ func GetAttachmentsByCommentID(ctx context.Context, commentID int64) ([]*Attachm

 // GetAttachmentByReleaseIDFileName returns attachment by given releaseId and fileName.
 func GetAttachmentByReleaseIDFileName(ctx context.Context, releaseID int64, fileName string) (*Attachment, error) {
-	attach, has, err := db.Get[Attachment](ctx, builder.Eq{"release_id": releaseID, "`name`": fileName})
+	attach := &Attachment{ReleaseID: releaseID, Name: fileName}
+	has, err := db.GetEngine(ctx).Get(attach)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -102,13 +102,20 @@ func GetCollaborators(ctx context.Context, opts *FindCollaborationOptions) ([]*C

 // GetCollaboration get collaboration for a repository id with a user id
 func GetCollaboration(ctx context.Context, repoID, uid int64) (*Collaboration, error) {
-	collaboration, _, err := db.Get[Collaboration](ctx, builder.Eq{"repo_id": repoID, "user_id": uid})
+	collaboration := &Collaboration{
+		RepoID: repoID,
+		UserID: uid,
+	}
+	has, err := db.GetEngine(ctx).Get(collaboration)
+	if !has {
+		collaboration = nil
+	}
 	return collaboration, err
 }

 // IsCollaborator check if a user is a collaborator of a repository
 func IsCollaborator(ctx context.Context, repoID, userID int64) (bool, error) {
-	return db.Exist[Collaboration](ctx, builder.Eq{"repo_id": repoID, "user_id": userID})
+	return db.GetEngine(ctx).Get(&Collaboration{RepoID: repoID, UserID: userID})
 }

 // ChangeCollaborationAccessMode sets new access mode for the collaboration.
@@ -119,7 +126,13 @@ func ChangeCollaborationAccessMode(ctx context.Context, repo *Repository, uid in
 	}

 	return db.WithTx(ctx, func(ctx context.Context) error {
-		collaboration, has, err := db.Get[Collaboration](ctx, builder.Eq{"repo_id": repo.ID, "user_id": uid})
+		e := db.GetEngine(ctx)
+
+		collaboration := &Collaboration{
+			RepoID: repo.ID,
+			UserID: uid,
+		}
+		has, err := e.Get(collaboration)
 		if err != nil {
 			return fmt.Errorf("get collaboration: %w", err)
 		} else if !has {
@@ -131,12 +144,12 @@ func ChangeCollaborationAccessMode(ctx context.Context, repo *Repository, uid in
 		}
 		collaboration.Mode = mode

-		if _, err = db.GetEngine(ctx).
+		if _, err = e.
 			ID(collaboration.ID).
 			Cols("mode").
 			Update(collaboration); err != nil {
 			return fmt.Errorf("update collaboration: %w", err)
-		} else if _, err = db.Exec(ctx, "UPDATE access SET mode = ? WHERE user_id = ? AND repo_id = ?", mode, uid, repo.ID); err != nil {
+		} else if _, err = e.Exec("UPDATE access SET mode = ? WHERE user_id = ? AND repo_id = ?", mode, uid, repo.ID); err != nil {
 			return fmt.Errorf("update access table: %w", err)
 		}

@@ -161,5 +174,5 @@ func IsOwnerMemberCollaborator(ctx context.Context, repo *Repository, userID int
 		return true, nil
 	}

-	return db.Exist[Collaboration](ctx, builder.Eq{"repo_id": repo.ID, "user_id": userID})
+	return db.GetEngine(ctx).Get(&Collaboration{RepoID: repo.ID, UserID: userID})
 }
@@ -12,8 +12,6 @@ import (
 	"gitea.dev/modules/log"
 	"gitea.dev/modules/timeutil"
 	"gitea.dev/modules/util"
-
-	"xorm.io/builder"
 )

 // ErrMirrorNotExist mirror does not exist error
@@ -78,7 +76,8 @@ func (m *Mirror) ScheduleNextUpdate() {

 // GetMirrorByRepoID returns mirror information of a repository.
 func GetMirrorByRepoID(ctx context.Context, repoID int64) (*Mirror, error) {
-	m, has, err := db.Get[Mirror](ctx, builder.Eq{"repo_id": repoID})
+	m := &Mirror{RepoID: repoID}
+	has, err := db.GetEngine(ctx).Get(m)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -10,8 +10,6 @@ import (

 	"gitea.dev/models/db"
 	"gitea.dev/modules/util"
-
-	"xorm.io/builder"
 )

 // ErrRedirectNotExist represents a "RedirectNotExist" kind of error.
@@ -54,8 +52,8 @@ func init() {
 // LookupRedirect look up if a repository has a redirect name
 func LookupRedirect(ctx context.Context, ownerID int64, repoName string) (int64, error) {
 	repoName = strings.ToLower(repoName)
-	redirect, has, err := db.Get[Redirect](ctx, builder.Eq{"owner_id": ownerID, "lower_name": repoName})
-	if err != nil {
+	redirect := &Redirect{OwnerID: ownerID, LowerName: repoName}
+	if has, err := db.GetEngine(ctx).Get(redirect); err != nil {
 		return 0, err
 	} else if !has {
 		return 0, ErrRedirectNotExist{OwnerID: ownerID, RepoName: repoName}
@@ -216,7 +216,8 @@ func AddReleaseAttachments(ctx context.Context, releaseID int64, attachmentUUIDs

 // GetRelease returns release by given ID.
 func GetRelease(ctx context.Context, repoID int64, tagName string) (*Release, error) {
-	rel, has, err := db.Get[Release](ctx, builder.Eq{"repo_id": repoID, "lower_tag_name": strings.ToLower(tagName)})
+	rel := &Release{RepoID: repoID, LowerTagName: strings.ToLower(tagName)}
+	has, err := db.GetEngine(ctx).Get(rel)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -849,9 +849,9 @@ func GetRepositoriesMapByIDs(ctx context.Context, ids []int64) (map[int64]*Repos
 }

 func IsRepositoryModelExist(ctx context.Context, u *user_model.User, repoName string) (bool, error) {
-	return db.Exist[Repository](ctx, builder.Eq{
-		"owner_id":   u.ID,
-		"lower_name": strings.ToLower(repoName),
+	return db.GetEngine(ctx).Get(&Repository{
+		OwnerID:   u.ID,
+		LowerName: strings.ToLower(repoName),
 	})
 }

@@ -70,8 +70,6 @@ func MakeRestrictedPermissions() ActionsTokenPermissions {

 type ActionsConfig struct {
 	DisabledWorkflows []string
-	// DisabledScopedWorkflows maps a scoped workflow's source repository ID to the entry names opted out of in this repository.
-	DisabledScopedWorkflows map[int64][]string
 	// CollaborativeOwnerIDs is a list of owner IDs used to share actions from private repos.
 	// Only workflows from the private repos whose owners are in CollaborativeOwnerIDs can access the current repo's actions.
 	CollaborativeOwnerIDs []int64
@@ -100,29 +98,6 @@ func (cfg *ActionsConfig) DisableWorkflow(file string) {
 	cfg.DisabledWorkflows = append(cfg.DisabledWorkflows, file)
 }

-func (cfg *ActionsConfig) IsScopedWorkflowDisabled(sourceRepoID int64, workflowID string) bool {
-	return slices.Contains(cfg.DisabledScopedWorkflows[sourceRepoID], workflowID)
-}
-
-func (cfg *ActionsConfig) DisableScopedWorkflow(sourceRepoID int64, workflowID string) {
-	if slices.Contains(cfg.DisabledScopedWorkflows[sourceRepoID], workflowID) {
-		return
-	}
-	if cfg.DisabledScopedWorkflows == nil {
-		cfg.DisabledScopedWorkflows = make(map[int64][]string)
-	}
-	cfg.DisabledScopedWorkflows[sourceRepoID] = append(cfg.DisabledScopedWorkflows[sourceRepoID], workflowID)
-}
-
-func (cfg *ActionsConfig) EnableScopedWorkflow(sourceRepoID int64, workflowID string) {
-	workflowIDs := util.SliceRemoveAll(cfg.DisabledScopedWorkflows[sourceRepoID], workflowID)
-	if len(workflowIDs) == 0 {
-		delete(cfg.DisabledScopedWorkflows, sourceRepoID)
-		return
-	}
-	cfg.DisabledScopedWorkflows[sourceRepoID] = workflowIDs
-}
-
 func (cfg *ActionsConfig) AddCollaborativeOwner(ownerID int64) {
 	if !slices.Contains(cfg.CollaborativeOwnerIDs, ownerID) {
 		cfg.CollaborativeOwnerIDs = append(cfg.CollaborativeOwnerIDs, ownerID)
@@ -1,51 +0,0 @@
-// Copyright 2026 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package repo
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestActionsConfig_ScopedWorkflowOptOut(t *testing.T) {
-	cfg := &ActionsConfig{}
-
-	assert.False(t, cfg.IsScopedWorkflowDisabled(100, "ci.yml"))
-
-	cfg.DisableScopedWorkflow(100, "ci.yml")
-	assert.True(t, cfg.IsScopedWorkflowDisabled(100, "ci.yml"))
-
-	// idempotent
-	cfg.DisableScopedWorkflow(100, "ci.yml")
-	assert.Len(t, cfg.DisabledScopedWorkflows, 1)
-
-	// keyed by source repo: the same filename from a different source repo is independent
-	assert.False(t, cfg.IsScopedWorkflowDisabled(200, "ci.yml"))
-
-	// must not collide with the repo-level DisabledWorkflows list (bare filename)
-	assert.False(t, cfg.IsWorkflowDisabled("ci.yml"))
-	cfg.DisableWorkflow("ci.yml")
-	assert.True(t, cfg.IsWorkflowDisabled("ci.yml"))
-	assert.True(t, cfg.IsScopedWorkflowDisabled(100, "ci.yml"), "repo-level disable must not touch the scoped entry")
-
-	cfg.EnableScopedWorkflow(100, "ci.yml")
-	assert.False(t, cfg.IsScopedWorkflowDisabled(100, "ci.yml"))
-	assert.True(t, cfg.IsWorkflowDisabled("ci.yml"), "enabling the scoped entry must not touch the repo-level disable")
-}
-
-func TestActionsConfig_ScopedWorkflowSerialization(t *testing.T) {
-	cfg := &ActionsConfig{}
-	cfg.DisableScopedWorkflow(100, "ci.yml")
-	cfg.DisableWorkflow("repo.yml")
-
-	bs, err := cfg.ToDB()
-	require.NoError(t, err)
-
-	got := &ActionsConfig{}
-	require.NoError(t, got.FromDB(bs))
-	assert.True(t, got.IsScopedWorkflowDisabled(100, "ci.yml"))
-	assert.True(t, got.IsWorkflowDisabled("repo.yml"))
-}
@@ -9,8 +9,6 @@ import (
 	"gitea.dev/models/db"
 	user_model "gitea.dev/models/user"
 	"gitea.dev/modules/timeutil"
-
-	"xorm.io/builder"
 )

 // Star represents a starred repo by a user.
@@ -70,7 +68,7 @@ func StarRepo(ctx context.Context, doer *user_model.User, repo *Repository, star

 // IsStaring checks if user has starred given repository.
 func IsStaring(ctx context.Context, userID, repoID int64) bool {
-	has, _ := db.Exist[Star](ctx, builder.Eq{"uid": userID, "repo_id": repoID})
+	has, _ := db.GetEngine(ctx).Get(&Star{UID: userID, RepoID: repoID})
 	return has
 }

@@ -10,8 +10,6 @@ import (
 	user_model "gitea.dev/models/user"
 	"gitea.dev/modules/setting"
 	"gitea.dev/modules/timeutil"
-
-	"xorm.io/builder"
 )

 // WatchMode specifies what kind of watch the user has on a repository
@@ -43,14 +41,12 @@ func init() {
 }

 // GetWatch gets what kind of subscription a user has on a given repository; returns dummy record if none found
-func GetWatch(ctx context.Context, userID, repoID int64) (*Watch, error) {
-	watch, has, err := db.Get[Watch](ctx, builder.Eq{"user_id": userID, "repo_id": repoID})
+func GetWatch(ctx context.Context, userID, repoID int64) (Watch, error) {
+	watch := Watch{UserID: userID, RepoID: repoID}
+	has, err := db.GetEngine(ctx).Get(&watch)
 	if err != nil {
 		return watch, err
 	}
-	if watch == nil {
-		watch = &Watch{UserID: userID, RepoID: repoID}
-	}
 	if !has {
 		watch.Mode = WatchModeNone
 	}
@@ -68,7 +64,7 @@ func IsWatching(ctx context.Context, userID, repoID int64) bool {
 	return err == nil && IsWatchMode(watch.Mode)
 }

-func watchRepoMode(ctx context.Context, watch *Watch, mode WatchMode) (err error) {
+func watchRepoMode(ctx context.Context, watch Watch, mode WatchMode) (err error) {
 	if watch.Mode == mode {
 		return nil
 	}
@@ -7,8 +7,6 @@ import (
 	"context"

 	"gitea.dev/models/db"
-
-	"xorm.io/builder"
 )

 // AppState represents a state record in database
@@ -46,7 +44,9 @@ func SaveAppStateContent(ctx context.Context, key, content string) error {

 // GetAppStateContent gets an app state from database
 func GetAppStateContent(ctx context.Context, key string) (content string, err error) {
-	appState, has, err := db.Get[AppState](ctx, builder.Eq{"id": key})
+	e := db.GetEngine(ctx)
+	appState := &AppState{ID: key}
+	has, err := e.Get(appState)
 	if err != nil {
 		return "", err
 	} else if !has {
@@ -348,8 +348,8 @@ func VerifyActiveEmailCode(ctx context.Context, code, email string) *EmailAddres
 		opts := &TimeLimitCodeOptions{Purpose: TimeLimitCodeActivateEmail, NewEmail: email}
 		data := makeTimeLimitCodeHashData(opts, user)
 		if base.VerifyTimeLimitCode(time.Now(), data, setting.Service.ActiveCodeLives, prefix) {
-			emailAddress, has, _ := db.Get[EmailAddress](ctx, builder.Eq{"uid": user.ID, "email": email})
-			if has {
+			emailAddress := &EmailAddress{UID: user.ID, Email: email}
+			if has, _ := db.GetEngine(ctx).Get(emailAddress); has {
 				return emailAddress
 			}
 		}
@@ -8,8 +8,6 @@ import (

 	"gitea.dev/models/db"
 	"gitea.dev/modules/timeutil"
-
-	"xorm.io/builder"
 )

 // Follow represents relations of user and their followers.
@@ -26,7 +24,7 @@ func init() {

 // IsFollowing returns true if user is following followID.
 func IsFollowing(ctx context.Context, userID, followID int64) bool {
-	has, _ := db.Exist[Follow](ctx, builder.Eq{"user_id": userID, "follow_id": followID})
+	has, _ := db.GetEngine(ctx).Get(&Follow{UserID: userID, FollowID: followID})
 	return has
 }

@@ -9,8 +9,6 @@ import (

 	"gitea.dev/models/db"
 	"gitea.dev/modules/util"
-
-	"xorm.io/builder"
 )

 // UserOpenID is the list of all OpenID identities of a user.
@@ -45,7 +43,7 @@ func isOpenIDUsed(ctx context.Context, uri string) (bool, error) {
 		return true, nil
 	}

-	return db.Exist[UserOpenID](ctx, builder.Eq{"uri": uri})
+	return db.GetEngine(ctx).Get(&UserOpenID{URI: uri})
 }

 // ErrOpenIDAlreadyUsed represents a "OpenIDAlreadyUsed" kind of error.
@@ -10,8 +10,6 @@ import (

 	"gitea.dev/models/db"
 	"gitea.dev/modules/util"
-
-	"xorm.io/builder"
 )

 // ErrUserRedirectNotExist represents a "UserRedirectNotExist" kind of error.
@@ -52,8 +50,8 @@ func init() {
 // LookupUserRedirect look up userID if a user has a redirect name
 func LookupUserRedirect(ctx context.Context, userName string) (int64, error) {
 	userName = strings.ToLower(userName)
-	redirect, has, err := db.Get[Redirect](ctx, builder.Eq{"lower_name": userName})
-	if err != nil {
+	redirect := &Redirect{LowerName: userName}
+	if has, err := db.GetEngine(ctx).Get(redirect); err != nil {
 		return 0, err
 	} else if !has {
 		return 0, ErrUserRedirectNotExist{Name: userName}
@@ -125,7 +125,8 @@ func GetUserSetting(ctx context.Context, userID int64, key string, def ...string
 		return "", err
 	}

-	setting, has, err := db.Get[Setting](ctx, builder.Eq{"user_id": userID, "setting_key": key})
+	setting := &Setting{UserID: userID, SettingKey: key}
+	has, err := db.GetEngine(ctx).Get(setting)
 	if err != nil {
 		return "", err
 	}
@@ -606,10 +606,11 @@ var (
 		"repo-avatars",

 		"captcha",
-		"login", // oauth2 login
-		"org",   // org create/manage, or "/org/{org}", BUT if an org is named as "invite" then it goes wrong
-		"repo",  // repo create/migrate, etc
-		"user",  // user login/activate/settings, etc
+		"login",   // oauth2 login
+		"org",     // org create/manage, or "/org/{org}", BUT if an org is named as "invite" then it goes wrong
+		"repo",    // repo create/migrate, etc
+		"user",    // user login/activate/settings, etc
+		"noreply", // email noreply

 		"explore",
 		"issues",
@@ -627,6 +628,13 @@ var (

 		"ghost",         // reserved name for deleted users (id: -1)
 		"gitea-actions", // gitea builtin user (id: -2)
+
+		// M8SH reserved mail role accounts (email local-parts).
+		"noreply",
+		"postmaster",
+		"healthcheck",
+		"abuse",
+		"mailer",
 	}

 	// These names are reserved for user accounts: user's keys, user's rss feed, user's avatar, etc.
@@ -1276,7 +1284,8 @@ func GetUserByEmail(ctx context.Context, email string) (*User, error) {

 	email = strings.ToLower(email)
 	// Otherwise, check in alternative list for activated email addresses
-	emailAddress, has, err := db.Get[EmailAddress](ctx, builder.Eq{"lower_email": email, "is_activated": true})
+	emailAddress := &EmailAddress{LowerEmail: email, IsActivated: true}
+	has, err := db.GetEngine(ctx).Get(emailAddress)
 	if err != nil {
 		return nil, err
 	}
@@ -1296,29 +1305,13 @@ func GetUserByEmail(ctx context.Context, email string) (*User, error) {
 	return nil, ErrUserNotExist{Name: email}
 }

-func GetIndividualUserByPrimaryEmail(ctx context.Context, email string) (*User, error) {
-	email = strings.ToLower(strings.TrimSpace(email))
-	if len(email) == 0 {
-		return nil, ErrUserNotExist{Name: email}
-	}
-
-	user, has, err := db.Get[User](ctx, builder.Eq{"email": email, "type": UserTypeIndividual})
-	if err != nil {
-		return nil, err
-	}
-	if !has {
-		return nil, ErrUserNotExist{Name: email}
-	}
-	return user, nil
-}
-
-func GetIndividualUserByLoginSource(ctx context.Context, loginType auth.Type, loginSource int64, loginName string) (*User, bool, error) {
-	user, has, err := db.Get[User](ctx, builder.Eq{"login_type": loginType, "login_source": loginSource, "login_name": loginName})
+func GetIndividualUser(ctx context.Context, user *User) (bool, error) {
+	// FIXME: the design is wrong, empty User fields won't apply, this function should be removed in the future
+	has, err := db.GetEngine(ctx).Get(user)
 	if has && user.Type != UserTypeIndividual {
 		has = false
-		user = nil
 	}
-	return user, has, err
+	return has, err
 }

 // GetUserByOpenID returns the user object by given OpenID if exists.
@@ -69,9 +69,6 @@ func Parse(content []byte, options ...ParseOption) ([]*SingleWorkflow, error) {
 				runsOn[i] = evaluator.Interpolate(v)
 			}
 			job.RawRunsOn = encodeRunsOn(runsOn)
-			if err := evaluator.EvaluateYamlNode(&job.RawContinueOnError); err != nil {
-				return nil, fmt.Errorf("evaluate continue-on-error for job %q: %w", id, err)
-			}
 			swf := &SingleWorkflow{
 				Name:           workflow.Name,
 				RawOn:          workflow.RawOn,
@@ -58,11 +58,6 @@ func TestParse(t *testing.T) {
 			options: nil,
 			wantErr: false,
 		},
-		{
-			name:    "continue_on_error_expr",
-			options: nil,
-			wantErr: false,
-		},
 	}
 	invalidFileTests := []struct {
 		name string
@@ -79,37 +79,23 @@ func (w *SingleWorkflow) Marshal() ([]byte, error) {
 }

 type Job struct {
-	Name               string                    `yaml:"name,omitempty"`
-	RawNeeds           yaml.Node                 `yaml:"needs,omitempty"`
-	RawRunsOn          yaml.Node                 `yaml:"runs-on,omitempty"`
-	Env                yaml.Node                 `yaml:"env,omitempty"`
-	If                 yaml.Node                 `yaml:"if,omitempty"`
-	Steps              []*Step                   `yaml:"steps,omitempty"`
-	TimeoutMinutes     string                    `yaml:"timeout-minutes,omitempty"`
-	RawContinueOnError yaml.Node                 `yaml:"continue-on-error,omitempty"`
-	Services           map[string]*ContainerSpec `yaml:"services,omitempty"`
-	Strategy           Strategy                  `yaml:"strategy,omitempty"`
-	RawContainer       yaml.Node                 `yaml:"container,omitempty"`
-	Defaults           Defaults                  `yaml:"defaults,omitempty"`
-	Outputs            map[string]string         `yaml:"outputs,omitempty"`
-	Uses               string                    `yaml:"uses,omitempty"`
-	With               map[string]any            `yaml:"with,omitempty"`
-	RawSecrets         yaml.Node                 `yaml:"secrets,omitempty"`
-	RawConcurrency     *model.RawConcurrency     `yaml:"concurrency,omitempty"`
-	RawPermissions     yaml.Node                 `yaml:"permissions,omitempty"`
-}
-
-// GetContinueOnError decodes the continue-on-error field to a bool.
-// The field may be a literal bool or an already-evaluated expression node.
-func (j *Job) GetContinueOnError() bool {
-	if j.RawContinueOnError.Kind == 0 {
-		return false
-	}
-	var v bool
-	if err := j.RawContinueOnError.Decode(&v); err != nil {
-		return false
-	}
-	return v
+	Name           string                    `yaml:"name,omitempty"`
+	RawNeeds       yaml.Node                 `yaml:"needs,omitempty"`
+	RawRunsOn      yaml.Node                 `yaml:"runs-on,omitempty"`
+	Env            yaml.Node                 `yaml:"env,omitempty"`
+	If             yaml.Node                 `yaml:"if,omitempty"`
+	Steps          []*Step                   `yaml:"steps,omitempty"`
+	TimeoutMinutes string                    `yaml:"timeout-minutes,omitempty"`
+	Services       map[string]*ContainerSpec `yaml:"services,omitempty"`
+	Strategy       Strategy                  `yaml:"strategy,omitempty"`
+	RawContainer   yaml.Node                 `yaml:"container,omitempty"`
+	Defaults       Defaults                  `yaml:"defaults,omitempty"`
+	Outputs        map[string]string         `yaml:"outputs,omitempty"`
+	Uses           string                    `yaml:"uses,omitempty"`
+	With           map[string]any            `yaml:"with,omitempty"`
+	RawSecrets     yaml.Node                 `yaml:"secrets,omitempty"`
+	RawConcurrency *model.RawConcurrency     `yaml:"concurrency,omitempty"`
+	RawPermissions yaml.Node                 `yaml:"permissions,omitempty"`
 }

 func (j *Job) Clone() *Job {
@@ -117,24 +103,23 @@ func (j *Job) Clone() *Job {
 		return nil
 	}
 	return &Job{
-		Name:               j.Name,
-		RawNeeds:           j.RawNeeds,
-		RawRunsOn:          j.RawRunsOn,
-		Env:                j.Env,
-		If:                 j.If,
-		Steps:              j.Steps,
-		TimeoutMinutes:     j.TimeoutMinutes,
-		RawContinueOnError: j.RawContinueOnError,
-		Services:           j.Services,
-		Strategy:           j.Strategy,
-		RawContainer:       j.RawContainer,
-		Defaults:           j.Defaults,
-		Outputs:            j.Outputs,
-		Uses:               j.Uses,
-		With:               j.With,
-		RawSecrets:         j.RawSecrets,
-		RawConcurrency:     j.RawConcurrency,
-		RawPermissions:     j.RawPermissions,
+		Name:           j.Name,
+		RawNeeds:       j.RawNeeds,
+		RawRunsOn:      j.RawRunsOn,
+		Env:            j.Env,
+		If:             j.If,
+		Steps:          j.Steps,
+		TimeoutMinutes: j.TimeoutMinutes,
+		Services:       j.Services,
+		Strategy:       j.Strategy,
+		RawContainer:   j.RawContainer,
+		Defaults:       j.Defaults,
+		Outputs:        j.Outputs,
+		Uses:           j.Uses,
+		With:           j.With,
+		RawSecrets:     j.RawSecrets,
+		RawConcurrency: j.RawConcurrency,
+		RawPermissions: j.RawPermissions,
 	}
 }

--- a/Show More
+++ b/Show More